conlink 2.0.0 → 2.0.2

package/old/veth-link.sh

@@ -1,96 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2023, Viasat, Inc
-# Licensed under MPL 2.0
-
-set -e
-
-usage () {
-  echo >&2 "${0} [OPTIONS] INTF0 INTF1 PID0 PID1"
-  echo >&2 ""
-  echo >&2 "  INTF0 is the name of first veth interface"
-  echo >&2 "  INTF1 is the name of second veth interface name"
-  echo >&2 "  PID0 is the process ID of the first netns"
-  echo >&2 "  PID1 is the process ID of the second netns"
-  echo >&2 ""
-  echo >&2 "OPTIONS:"
-  echo >&2 "  --verbose        - Verbose output (set -x)"
-  echo >&2 "  --ip0 IP0        - IP (CIDR) address for INTF0"
-  echo >&2 "  --ip1 IP1        - IP (CIDR) address for INTF1"
-  echo >&2 "  --mac0 MAC0      - MAC address for INTF0"
-  echo >&2 "  --mac1 MAC1      - MAC address for INTF1"
-  echo >&2 "  --route0 'ROUTE' - route to add to INTF0"
-  echo >&2 "  --route1 'ROUTE' - route to add to INTF1"
-  echo >&2 "  --mtu MTU        - MTU for both interfaces"
-  exit 2
-}
-
-VERBOSE=${VERBOSE:-}
-IP0= IP1= MAC0= MAC1= ROUTE0= ROUTE1= MTU=
-
-info() { echo "veth-link [${PID0}/${IF0} <-> ${PID1}/${IF1}] ${*}"; }
-warn() { >&2 echo "veth-link [${PID0}/${IF0} <-> ${PID1}/${IF1}] ${*}"; }
-die()  { warn "ERROR: ${*}"; exit 1; }
-
-# Set name, MAC, IP, ROUTE, MTU, and up state for interface within netns
-setup_if() {
-  local SIF=$1 IF=$2 NS=$3 MAC=$4 IP=$5 ROUTE=$6 MTU=$7
-
-  ip -netns ${NS} --force -b - <<EOF
-      link set dev ${SIF} name ${IF}
-      ${IP:+addr add ${IP} dev ${IF}}
-      ${MAC:+link set dev ${IF} address ${MAC}}
-      ${MTU:+link set dev ${IF} mtu ${MTU}}
-      link set dev ${IF} up
-      ${ROUTE:+route add ${ROUTE} dev ${IF}}
-EOF
-}
-
-# Parse arguments
-positional=
-while [ "${*}" ]; do
-  param=$1; OPTARG=$2
-  case ${param} in
-  --verbose) VERBOSE=1 ;;
-  --ip0) IP0="${OPTARG}"; shift ;;
-  --ip1) IP1="${OPTARG}"; shift ;;
-  --mac0) MAC0="${OPTARG}"; shift ;;
-  --mac1) MAC1="${OPTARG}"; shift ;;
-  --route0) ROUTE0="${OPTARG}"; shift ;;
-  --route1) ROUTE1="${OPTARG}"; shift ;;
-  --mtu) MTU="${OPTARG}"; shift ;;
-  -h|--help) usage ;;
-  *) positional="${positional} $1" ;;
-  esac
-  shift
-done
-set -- ${positional}
-IF0=$1 IF1=$2 PID0=$3 PID1=$4
-
-[ "${VERBOSE}" ] && set -x || true
-
-# Check arguments
-[ "${IF0}" -a "${IF1}" -a "${PID0}" -a "${PID1}" ] || usage
-
-# Sanity checks
-[ ! -d /proc/$PID0 ] && die "PID0 $PID0 is no longer running!"
-[ ! -d /proc/$PID1 ] && die "PID1 $PID1 is no longer running!"
-
-### Do the work
-
-info "Creating veth pair link (${IP0}|${MAC0} <-> ${IP1}|${MAC1})"
-
-info "Creating ip netns to pid mappings"
-mkdir -p /var/run/netns
-ln -sf /proc/${PID0}/ns/net /var/run/netns/ns${PID0}
-ln -sf /proc/${PID1}/ns/net /var/run/netns/ns${PID1}
-
-info "Creating veth pair with ends in each namespace"
-SIF0=if0-${RANDOM} SIF1=if1-${RANDOM}
-ip link add ${SIF0} netns ns${PID0} type veth peer ${SIF1} netns ns${PID1}
-
-info "Setting netns, name, MAC, IP, ROUTE, MTU, and up state"
-setup_if ${SIF0} ${IF0} ns${PID0} "${MAC0}" "${IP0}" "${ROUTE0}" "${MTU}"
-setup_if ${SIF1} ${IF1} ns${PID1} "${MAC1}" "${IP1}" "${ROUTE1}" "${MTU}"
-
-info "Created veth pair link (${IP0}|${MAC0} <-> ${IP1}|${MAC1})"

package/schema-ish.yaml

@@ -1,29 +0,0 @@
-links:
-  - mode: local (default), host, tunnel
-    service: node1, 
-      # OR
-    container: examples_node1_1
-    remote: SWITCH (local), HOST_INTF (host), REMOTE_IP (tunnel)
-    intf: eth0
-    ip: INTF_IP
-    mac: INTF_MAC
-    nat: ...
-    tc: ...
-
-    # mode local
-    ovs: ...
-
-    # mode host
-    type: vlan, macvlan, macvtap, ipvlan, ipvtap
-    host-mode: private, vepa, bridge, etc
-    vlanid: 5
-
-    # mode tunnel
-    type: geneve
-    vni: 1001
-
-switches:
-  - name: s1
-    opts: ...
-
-containers:

package/src/conlink/net2dot.cljs

@@ -1,158 +0,0 @@
-#!/usr/bin/env nbb
-
-(ns conlink.net2dot
-  (:require [clojure.string :as S]
-            [clojure.pprint :refer [pprint]]
-            [promesa.core :as P]
-            [conlink.util :refer [parse-opts Eprintln Epprint fatal]]
-            [conlink.core :as conlink]))
-            
-(def usage "
-net2dot: convert conlink network config to GraphViz/dot representation.
-
-Usage:
-  net2dot [options]
-
-Options:
-  -v, --verbose                     Show verbose output (stderr)
-                                    [env: VERBOSE]
-  --network-file NETWORK-FILE...    Network config file
-  --compose-file COMPOSE-FILE...    Docker compose file with network config
-")
-
-(def DEFAULT-PROPS "shape=box fontsize=12 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 TUNNEL-PROPS "fillcolor=\"#a5a5a5\" color=\"#888888\"")
-(def CONTAINER-PROPS "style=\"rounded,filled\" fillcolor = \"#e1d5e7\" color = \"#9673a6\"")
-(def SERVICE-PROPS (str CONTAINER-PROPS " fillcolor = \"#d1c5e7\" penwidth = 2"))
-(def INTF-PROPS "width=0.1 height=0.1 fontsize=10 fillcolor=\"#ffbb9e\" color=\"#d7db00\"")
-(def NIC-PROPS "fontsize=12 fillcolor=\"#ffbb9e\" color=\"#d7db00\"")
-
-(set! conlink/INTF-MAX-LEN 100)
-
-(defn dot-id [n]
-  (-> n
-      (S/replace #"[:]" "_COLON_")
-      (S/replace #"[-]" "_DASH_")
-      (S/replace #"[*]" "_STAR_")
-      (S/replace #"[$]" "_DOLLAR_")
-      (S/replace #"[{]" "_LCURLY_")
-      (S/replace #"[}]" "_LCURLY_")
-      (S/replace #"[ ]" "_SPACE_")))
-
-(defn digraph [links tunnels]
-  (let [veth-links (filter #(= :veth (:type %)) links)
-        vlan-links (filter #(conlink/VLAN-TYPES (:type %)) links)]
-    (S/join
-      "\n"
-      (flatten
-        [(str "digraph D {")
-         (str "  splines = true;")
-         (str "  compound = true;")
-         (str "  node [" DEFAULT-PROPS "];")
-
-         ""
-         " // host system"
-         (str "  subgraph cluster_host {")
-         (str "    label = \"host system\";")
-         (str "    " HOST-PROPS ";")
-
-         ""
-         "    // main link nodes"
-         (for [{:keys [dev dev-id]} links]
-           (str "    " (dot-id dev-id) " [label=\"" dev "\" " INTF-PROPS "];"))
-
-         ""
-         "    // containers and their links/interfaces"
-         (for [[container-name links] (group-by (comp :name :container) links)]
-           [(str "    subgraph cluster_" (dot-id container-name) " {")
-            (str "      label = \"" (:container-label (first links)) "\";")
-            (if (:service (first links))
-              (str "      " SERVICE-PROPS ";")
-              (str "      " CONTAINER-PROPS ";"))
-            (for [link links]
-              (str "      " (dot-id (:dev-id link))))
-            (str "    }")])
-
-         ""
-         "    // bridges, tunnels, veth connections"
-         (str "    subgraph cluster_conlink {")
-         (str "      label = \"conlink/network\";")
-         (str "      " CONLINK-PROPS ";")
-         (for [bridge (set (keep :bridge veth-links))
-               :let [blinks (filter #(= bridge (:bridge %)) veth-links)]]
-           [(str "      subgraph cluster_bridge_" (dot-id bridge) " {")
-            (str "        label = \"" bridge "\";")
-            (str "        " BRIDGE-PROPS ";")
-            (str "        bridge_"  (dot-id bridge) " [shape=point style=invis];")
-            (for [{:keys [dev-id outer-dev]} blinks]
-              [(str "        " (dot-id outer-dev)
-                   " [label=\"" outer-dev "\" " INTF-PROPS "];")
-               (str "        " (dot-id dev-id) " -> " (dot-id outer-dev))])
-            (for [{:keys [bridge outer-dev]} tunnels]
-              (str "        " (dot-id outer-dev)
-                   " [label=\"" outer-dev "\" " INTF-PROPS "];"))
-            (str "      }")])
-         (str "    }")
-
-         ""
-         "    // vlan/vtap links"
-         (for [outer-dev (set (keep :outer-dev vlan-links))
-               :let [olinks (filter #(= outer-dev (:outer-dev %)) vlan-links)]]
-           [(str "    " (dot-id outer-dev) " [label=\"" outer-dev "\" " NIC-PROPS "];")
-            (for [{:keys [dev-id outer-dev type vlanid vni ip]} olinks
-                  :let [label (str (name type) (when vlanid
-                                                 (str " " vlanid)))]]
-              (str "    " (dot-id dev-id) " -> " (dot-id outer-dev)
-                   " [label=\"" label "\"];"))])
-
-         "  // end of host system"
-         (str "  }")
-
-         ""
-         "  // remote hosts and tunnels links"
-         (for [{:keys [outer-dev remote]} tunnels]
-           [(str "  " (dot-id remote)
-                 " [label=\"remote host '" remote "'\" " TUNNEL-PROPS "];")
-            (str "  " (dot-id outer-dev) " -> " (dot-id remote)) ])
-
-         "}\n"]))))
-
-(defn enrich-link [{:as link :keys [service container]}]
-  (let [name (if service
-               (str "S_" service) #_(str "*_" service "_*")
-               container)
-        clabel (if service
-                 (str "service '"service "'")
-                 (str "container '" container "'"))
-        container {:id "CID"
-                   :pid 3
-                   :index 1
-                   :name name}]
-    (merge
-      (conlink/link-instance-enrich link container 2)
-      {:container-label clabel})))
-
-(defn enrich-tunnel [tunnel]
-  (conlink/tunnel-instance-enrich tunnel 2))
-
-
-(defn main
-  [& args]
-  (P/let
-    [{:keys [verbose compose-file network-file]} (parse-opts usage args)
-     _ (when (and (empty? network-file) (empty? compose-file))
-         (fatal 2 "either --network-file or --compose-file is required"))
-     network-config (P/-> (conlink/load-configs compose-file network-file)
-                          (conlink/enrich-network-config))
-     links (map enrich-link (:links network-config))
-     tunnels (map enrich-tunnel (:tunnels network-config))
-     dot-graph (digraph links tunnels)]
-    (when verbose
-      (Eprintln "Links:")
-      (Epprint links)
-      (Eprintln "Tunnels:")
-      (Epprint tunnels))
-    (println dot-graph)))

package/tests/invalid-schema-1.yaml

@@ -1,6 +0,0 @@
-# should pass
-links:
-  - {service: internet, type: dummy, dev: i0,   ip: 8.8.8.8/24}
-
-# should fail
-commands: "abc"

package/tests/invalid-schema-2.yaml

@@ -1,6 +0,0 @@
-# should pass
-links:
-  - {service: internet, type: dummy, dev: i0,   ip: 8.8.8.8/24}
-
-# should fail
-something-else: "abc"

package/tests/invalid-schema-3.yaml

@@ -1,17 +0,0 @@
-# type and veth type requires bridge
-
-links:
-  # should pass
-  - {service: node, type: dummy}
-  - {service: node, type: veth, bridge: s1}
-  - {service: node, bridge: s1}
-  - {service: node, type: vlan, vlanid: 100}
-
-  # Should error
-  - {service: node, type: magic}
-  - {service: node, type: veth}
-  - {service: node}
-  - {service: node, type: vlan}
-  - {service: node, bridge: s1, vlanid: 100}
-
-

package/tests/invalid-schema-4.yaml

@@ -1,14 +0,0 @@
-links:
-  # should pass
-  - {service: node, bridge: s1, ip: 10.0.1.1/16}
-  - {service: node, bridge: s1, mac: "00:11:99:00:00:99"}
-  - {service: node, bridge: s1, mac: "00:11:99:0a:0b:ff"}
-
-  # Should error
-  - {service: node, bridge: s1, ip: 10.0.1}
-  - {service: node, bridge: s1, ip: 10.0.1.1}
-  - {service: node, bridge: s1, ip: 1011.0.1.1/16}
-  - {service: node, bridge: s1, mac: "00:11:99:0a:0b"}
-  - {service: node, bridge: s1, mac: "00:11:99:0a:0b:fg"}
-
-

package/tests/invalid-schema-5.yaml

@@ -1,12 +0,0 @@
-# type and veth type requires bridge
-
-links:
-  # should pass
-  - {service: node, bridge: s1}
-  - {container: node, bridge: s1}
-
-  # Should fail
-  - {type: veth, bridge: s1}
-  - {bridge: s1}
-
-

package/tests/invalid-schema-6.yaml

@@ -1,12 +0,0 @@
-
-links:
-  # should pass
-  - {service: node, bridge: s1}
-
-tunnels:
-  # should pass
-  - {type: geneve, bridge: s1, remote: 1.1.1.1, vni: 1001}
-
-  # Should error
-  - {type: geneve,             remote: 1.1.1.1, vni: 1001}
-

package/tmp/conlink/.env

@@ -1 +0,0 @@
-blah