conlink 2.0.1 → 2.0.2

package/examples/test1.dot

@@ -1,286 +0,0 @@
-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/test4-multiple/all-compose.yaml

@@ -1,5 +0,0 @@
-version: "2.4"
-
-services:
-  network:
-    command: /app/build/conlink.js --compose-file ${COMPOSE_FILE:-examples/test4-multiple/base-compose.yaml:examples/test4-multiple/node1-compose.yaml:examples/test4-multiple/nodes2.yaml:examples/test4-multiple/all-compose.yaml} --network-file examples/test4-multiple/web-network.yaml

package/examples/test4-multiple/web-network.yaml

@@ -1,2 +0,0 @@
-commands:
-  - {service: r0, command: "python3 -m http.server 80"}

package/host-build.yaml

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

package/inspect.json

@@ -1,210 +0,0 @@
-[
-    {
-        "Id": "43e63a3c948443f55198f4de29fd96805fdb306398ff64d89f1103c355e28357",
-        "Created": "2023-10-11T15:55:04.428835024Z",
-        "Path": "sh",
-        "Args": [
-            "-c",
-            "while ! ip link show eth0 up; do sleep 1; done; sleep 864000"
-        ],
-        "State": {
-            "Status": "running",
-            "Running": true,
-            "Paused": false,
-            "Restarting": false,
-            "OOMKilled": false,
-            "Dead": false,
-            "Pid": 10216,
-            "ExitCode": 0,
-            "Error": "",
-            "StartedAt": "2023-10-11T15:55:04.576997181Z",
-            "FinishedAt": "0001-01-01T00:00:00Z"
-        },
-        "Image": "sha256:8ca4688f4f356596b5ae539337c9941abc78eda10021d35cbc52659c74d9b443",
-        "ResolvConfPath": "/var/lib/docker/containers/43e63a3c948443f55198f4de29fd96805fdb306398ff64d89f1103c355e28357/resolv.conf",
-        "HostnamePath": "/var/lib/docker/containers/43e63a3c948443f55198f4de29fd96805fdb306398ff64d89f1103c355e28357/hostname",
-        "HostsPath": "/var/lib/docker/containers/43e63a3c948443f55198f4de29fd96805fdb306398ff64d89f1103c355e28357/hosts",
-        "LogPath": "/var/lib/docker/containers/43e63a3c948443f55198f4de29fd96805fdb306398ff64d89f1103c355e28357/43e63a3c948443f55198f4de29fd96805fdb306398ff64d89f1103c355e28357-json.log",
-        "Name": "/examples_node2_1",
-        "RestartCount": 0,
-        "Driver": "overlay2",
-        "Platform": "linux",
-        "MountLabel": "",
-        "ProcessLabel": "",
-        "AppArmorProfile": "docker-default",
-        "ExecIDs": null,
-        "HostConfig": {
-            "Binds": [],
-            "ContainerIDFile": "",
-            "LogConfig": {
-                "Type": "json-file",
-                "Config": {}
-            },
-            "NetworkMode": "none",
-            "PortBindings": {},
-            "RestartPolicy": {
-                "Name": "",
-                "MaximumRetryCount": 0
-            },
-            "AutoRemove": false,
-            "VolumeDriver": "",
-            "VolumesFrom": [],
-            "ConsoleSize": [
-                0,
-                0
-            ],
-            "CapAdd": [
-                "NET_ADMIN"
-            ],
-            "CapDrop": null,
-            "CgroupnsMode": "host",
-            "Dns": null,
-            "DnsOptions": null,
-            "DnsSearch": null,
-            "ExtraHosts": null,
-            "GroupAdd": null,
-            "IpcMode": "private",
-            "Cgroup": "",
-            "Links": null,
-            "OomScoreAdj": 0,
-            "PidMode": "",
-            "Privileged": false,
-            "PublishAllPorts": false,
-            "ReadonlyRootfs": false,
-            "SecurityOpt": null,
-            "UTSMode": "",
-            "UsernsMode": "",
-            "ShmSize": 67108864,
-            "Runtime": "runc",
-            "Isolation": "",
-            "CpuShares": 0,
-            "Memory": 0,
-            "NanoCpus": 0,
-            "CgroupParent": "",
-            "BlkioWeight": 0,
-            "BlkioWeightDevice": null,
-            "BlkioDeviceReadBps": null,
-            "BlkioDeviceWriteBps": null,
-            "BlkioDeviceReadIOps": null,
-            "BlkioDeviceWriteIOps": null,
-            "CpuPeriod": 0,
-            "CpuQuota": 0,
-            "CpuRealtimePeriod": 0,
-            "CpuRealtimeRuntime": 0,
-            "CpusetCpus": "",
-            "CpusetMems": "",
-            "Devices": null,
-            "DeviceCgroupRules": null,
-            "DeviceRequests": null,
-            "MemoryReservation": 0,
-            "MemorySwap": 0,
-            "MemorySwappiness": null,
-            "OomKillDisable": false,
-            "PidsLimit": null,
-            "Ulimits": null,
-            "CpuCount": 0,
-            "CpuPercent": 0,
-            "IOMaximumIOps": 0,
-            "IOMaximumBandwidth": 0,
-            "MaskedPaths": [
-                "/proc/asound",
-                "/proc/acpi",
-                "/proc/kcore",
-                "/proc/keys",
-                "/proc/latency_stats",
-                "/proc/timer_list",
-                "/proc/timer_stats",
-                "/proc/sched_debug",
-                "/proc/scsi",
-                "/sys/firmware"
-            ],
-            "ReadonlyPaths": [
-                "/proc/bus",
-                "/proc/fs",
-                "/proc/irq",
-                "/proc/sys",
-                "/proc/sysrq-trigger"
-            ]
-        },
-        "GraphDriver": {
-            "Data": {
-                "LowerDir": "/var/lib/docker/overlay2/f45757baf87c92f0934409fa9617bd4027e1e4472711312b1d8145ca59cdf0f3-init/diff:/var/lib/docker/overlay2/0ee1adfcd9b69bb9354db86819da1c06904d5c664f8d9e0aded8c158a24654df/diff",
-                "MergedDir": "/var/lib/docker/overlay2/f45757baf87c92f0934409fa9617bd4027e1e4472711312b1d8145ca59cdf0f3/merged",
-                "UpperDir": "/var/lib/docker/overlay2/f45757baf87c92f0934409fa9617bd4027e1e4472711312b1d8145ca59cdf0f3/diff",
-                "WorkDir": "/var/lib/docker/overlay2/f45757baf87c92f0934409fa9617bd4027e1e4472711312b1d8145ca59cdf0f3/work"
-            },
-            "Name": "overlay2"
-        },
-        "Mounts": [],
-        "Config": {
-            "Hostname": "43e63a3c9484",
-            "Domainname": "",
-            "User": "",
-            "AttachStdin": false,
-            "AttachStdout": false,
-            "AttachStderr": false,
-            "Tty": false,
-            "OpenStdin": false,
-            "StdinOnce": false,
-            "Env": [
-                "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-            ],
-            "Cmd": [
-                "sh",
-                "-c",
-                "while ! ip link show eth0 up; do sleep 1; done; sleep 864000"
-            ],
-            "Image": "alpine",
-            "Volumes": null,
-            "WorkingDir": "",
-            "Entrypoint": null,
-            "OnBuild": null,
-            "Labels": {
-                "com.docker.compose.config-hash": "be458eaf2e2aba67235023be9f8342d88ce0e0f7979749d6496423229a954bd3",
-                "com.docker.compose.container-number": "1",
-                "com.docker.compose.oneoff": "False",
-                "com.docker.compose.project": "examples",
-                "com.docker.compose.project.config_files": "examples/test2-compose.yaml",
-                "com.docker.compose.project.working_dir": "/home/jmartin/work/viasat/repos/conlink.cljs/examples",
-                "com.docker.compose.service": "node2",
-                "com.docker.compose.version": "1.29.2"
-            }
-        },
-        "NetworkSettings": {
-            "Bridge": "",
-            "SandboxID": "963251cd8230a51e9c658653a3fdeedfe10e9f16c03aed802b69d5a6c86f6d19",
-            "HairpinMode": false,
-            "LinkLocalIPv6Address": "",
-            "LinkLocalIPv6PrefixLen": 0,
-            "Ports": {},
-            "SandboxKey": "/var/run/docker/netns/963251cd8230",
-            "SecondaryIPAddresses": null,
-            "SecondaryIPv6Addresses": null,
-            "EndpointID": "",
-            "Gateway": "",
-            "GlobalIPv6Address": "",
-            "GlobalIPv6PrefixLen": 0,
-            "IPAddress": "",
-            "IPPrefixLen": 0,
-            "IPv6Gateway": "",
-            "MacAddress": "",
-            "Networks": {
-                "none": {
-                    "IPAMConfig": null,
-                    "Links": null,
-                    "Aliases": null,
-                    "NetworkID": "c7b50bdae4d8c2baa2dfbfcf81a783cddcfd66df84c6ce3f3506985434a161c8",
-                    "EndpointID": "376d2c90a9e33a6e0fd62dc3f67c6f784d717594b54ebbb7e9d4d372ee0cf115",
-                    "Gateway": "",
-                    "IPAddress": "",
-                    "IPPrefixLen": 0,
-                    "IPv6Gateway": "",
-                    "GlobalIPv6Address": "",
-                    "GlobalIPv6PrefixLen": 0,
-                    "MacAddress": "",
-                    "DriverOpts": null
-                }
-            }
-        }
-    }
-]

package/modes0/a/deps

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

package/modes0/b/deps

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

package/modes0/c/deps

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

package/modes0/e/deps

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

package/modes1/a/deps

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

package/modes1/b/deps

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

package/modes1/c/deps

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

package/modes1/d/deps

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

package/modes2/a/deps

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

package/modes2/b/deps

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

package/modes2/c/deps

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

package/modes2/d/de

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

package/modes2/d/deps

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

package/modes3/accel/deps

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

package/modes4/a/deps

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

package/modes4/b/deps

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

package/net2dot.mjs

@@ -1,21 +0,0 @@
-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/notes.txt

@@ -1,82 +0,0 @@
-- Also see schema-ish.yaml
-links:
-  - type: TYPE         # Default: 'veth'
-                       # Others: '*vlan/*vtap', 'dummy', 'tunnel', etc
-
-    container: FOO     # full container name
-      # OR
-    service: FOO       # compose service name
-
-    bridge: BRIDGE     # name of OVS or linux bridge
-
-    base: BASE         # 'conlink', 'host', or 'local'
-                       # 'conlink' is default for 'type: veth'
-                       # 'host' is default for 'type: *vlan/*vtap'
-
-    dev: DEV           # internal container device/interface name
-    outer-dev: DEV     # conlink or host (*vlan) device/interface name
-
-    # --- optional general ---
-
-    ip(s): IP          # starting address, can include net slash to limit max
-    mac: MAC
-    mtu: MTU
-    route(s): ROUTE    # `ip route add ROUTE`, maybe add "dev INTF" automatically
-    tc(s): TC          # tc/qdisc commands/settings
-    flow(s): FLOW      # `ovs-ofctl add-flow DOMAIN FLOW`. With var templating.
-    command(s): CMD    # arbitrary shell cmd. After all links setup for this container
-
-    # --- optional for 'type: *vlan/*vtap' ---
-
-    mode: MODE         # 'bridge', etc
-    vlanid: VLANID     # VLAN #
-    nat: NAT           # nat target
-
-
-- type maps to 'ip link' type with default of 'veth'
-- when type is 'veth', then base default is 'conlink'
-- when type is 'veth' and base is 'conlink', then bridge is required.
-
-- conlink veth link: {type: veth [DEFAULT], base: conlink [DEFAULT], bridge: BRIDGE, dev: DEV}
-
-
-
-Dependencies in python version:
-- argparse
-- shlex (parsing commands)
-- compose_interpolation import TemplateWithDefaults
-- cerberus import Validator
-    - options: joi, ajv, json-schema, and z-schema.
-- docker
-- psutil (pid_exists)
-- json
-- yaml
-- mininet
-
-
-- [deprecated idea] conlink sub-commands:
-    conlink spit
-        - output override docker-compose file with conlink service
-        - figure out volume mounts to get to other compose file(s)
-    conlink dc up ...
-        - generate override docker-compose file with conlink service
-        - run the compose command with override file
-    conlink start 
-        - start inside compose
-    conlink run
-        - start outside compose
-
-
-tc:
-  tc-htb:
-    - replace cbq, control outbound bandwidth
-    tc qdisc ... dev dev ( parent classid | root) [ handle major: ] htb [ default minor-id ]
-    tc class ... dev dev parent major:[minor] [ classid major:minor ] htb rate rate [ ceil rate ] burst bytes [ cburst bytes ] [ prio priority ]
-
-  tc-cbq:
-    tc  qdisc ... dev dev ( parent classid | root) [ handle major: ] cbq [ allot bytes ] avpkt bytes bandwidth rate [ cell bytes ] [ ewma log ] [ mpu bytes ]
-    tc class ... dev dev parent major:[minor] [ classid major:minor ] cbq allot bytes [ bandwidth rate ] [ rate rate ] prio pri‐ority  [  weight  weight ] [ minburst packets ] [ maxburst packets ] [ ewma log ] [ cell bytes ] avpkt bytes [ mpu bytes ] [ bounded isolated ] [ split handle & defmap defmap ] [ estimator interval timeconstant ]
-
-  tc-netem:
-    tc qdisc ... dev DEVICE ] add netem OPTIONS
-