conlink 2.0.0

package/old/schema.yaml.bak

@@ -0,0 +1,76 @@
+$defs:
+  one_link:
+
+type: object
+additionalProperties: false
+required: ["links"]
+properties:
+  links:
+    type: array
+    items:
+      type: object
+#      oneOf: [{required: ["container"]},
+#              {required: ["service"]},
+#              #{required: ["bridge"], properties: {type: {const: {oneOf: ["geneve", "vxlan"]}}}}]
+#              #{properties: {type: {const: "geneve"}}, required: ["bridge"]},
+#              #{properties: {type: {const: "vxlan"}}, required: ["bridge"]}
+#              {allOf: [{properties: {type: {const: "geneve"}}},
+#                       {properties: {type: {const: "vxlan"}}}]}
+#              ]
+
+#      if:   {properties: {type: {const: "veth"}}}
+#      then:
+#        allOf:
+#          - {required: ["bridge"]}
+#          - {not: {required: ["vlanid", "vni", "remote"]}}
+#      else:
+#        not: {required: ["bridge"]}
+#        if:   {properties: {type: {const: "vlan"}}}
+#        then: {required: ["vlanid"]}
+#        else: {not: {required: ["vlanid"]}}
+
+      allOf:
+        - if:   {properties: {type: {const: "veth"}}}
+          then: {required: ["bridge"]}
+          else: {not: {required: ["BOGUS"]}}
+        - if:   {properties: {type: {const: "geneve"}}}
+          then: {required: ["bridge", "remote", "vni"]}
+          #else: {not: {required: ["bridge", "remote", "vni"]}}
+          else: {not: {required: ["BOGUS"]}}
+        - if:   {properties: {type: {const: "vxlan"}}}
+          then: {required: ["bridge", "remote", "vni"]}
+          #else: {not: {required: ["bridge", "remote", "vni"]}}
+          else: {not: {required: ["BOGUS"]}}
+
+      additionalProperties: false
+      properties:
+        type:
+          type: string
+          default: "veth"
+          enum: [veth, dummy, vlan, ipvlan, ipvtap, macvlan, macvtap, geneve, vxlan]
+        service:   {type: string}
+        container: {type: string}
+        bridge:    {type: string}
+        dev:       {type: string, default: "eth0"}
+        ip:        {type: string, pattern: "^([0-9]{1,3}[.]){3}[0-9]+/[0-9]*$"}
+        mac:       {type: string, pattern: "^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$"}
+        mtu:       {type: number}
+        route:     {type: string}
+    
+        vlanid:    {type: number}
+        nat:       {type: string, pattern: "^([0-9]{1,3}[.]){3}[0-9]+/[0-9]*$"}
+    
+        vni:       {type: number}
+        remote:    {type: string, pattern: "^([0-9]{1,3}[.]){3}[0-9]+$"}
+
+  commands:
+    type: array
+    items:
+      type: object
+      required: ["command"]
+      oneOf: [{required: ["container"]},
+              {required: ["service"]}]
+      properties:
+        service:   {type: string}
+        container: {type: string}
+        command:   {type: string}

package/old/test2b-compose.yaml

@@ -0,0 +1,18 @@
+# A docker-compose file with an external network configuration file
+# and docker containers that are connected via a switch. The
+# "internet" container is setup that is also connected to the switch
+# and is listening on 8.8.8.8 (to test routing from the nodes).
+
+version: "2.4"
+
+services:
+  node:
+    image: alpine
+    network_mode: none
+    scale: 2
+    command: sleep 864000
+
+  internet:
+    image: alpine
+    network_mode: none
+    command: sleep 864000

package/old/veth-link.sh

@@ -0,0 +1,96 @@
+#!/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/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "conlink",
+  "version": "2.0.0",
+  "dependencies": {
+    "ajv": "^8.12.0",
+    "dockerode": "^3.3.4",
+    "nbb": "^1.2.179",
+    "neodoc": "^2.0.2",
+    "yaml": "^2.2.1"
+  },
+  "devDependencies": {
+    "shadow-cljs": "^2.25.7",
+    "source-map-support": "^0.5.21"
+  }
+}

package/schema-ish.yaml

@@ -0,0 +1,29 @@
+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/schema.yaml

@@ -0,0 +1,71 @@
+$defs:
+  cidr: {type: string, pattern: "^([0-9]{1,3}[.]){3}[0-9]+/[0-9]*$"}
+  ip:   {type: string, pattern: "^([0-9]{1,3}[.]){3}[0-9]+$"}
+  mac:  {type: string, pattern: "^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$"}
+  intf: {type: string, pattern: "^.{1,15}$"}
+
+type: object
+additionalProperties: false
+required: ["links"]
+properties:
+  links:
+    type: array
+    items:
+      type: object
+      oneOf: [{required: ["container"]},
+              {required: ["service"]}]
+
+      if:   {properties: {type: {const: "veth"}}}
+      then:
+        allOf:
+          - {required: ["bridge"]}
+          - {not: {required: ["mode", "vlanid"]}}
+      else:
+        not: {required: ["bridge"]}
+        if:   {properties: {type: {const: "vlan"}}}
+        then: {required: ["vlanid"]}
+        else: {not: {required: ["mode", "vlanid"]}}
+
+      additionalProperties: false
+      properties:
+        type:
+          type: string
+          default: "veth"
+          enum: [veth, dummy, vlan, ipvlan, ipvtap, macvlan, macvtap]
+        service:   {type: string}
+        container: {type: string}
+        bridge:    {type: string}
+        outer-dev: {type: string, pattern: "^.{1,15}$"}
+        dev:       {type: string, pattern: "^.{1,15}$", default: "eth0"}
+        ip:        { "$ref": "#/$defs/cidr" }
+        mac:       { "$ref": "#/$defs/mac" }
+        mtu:       {type: number}
+        route:     {type: string}
+        nat:       { "$ref": "#/$defs/ip" }
+        netem:     {type: string}
+        mode:      {type: string}
+        vlanid:    {type: number}
+
+  tunnels:
+    type: array
+    items:
+      type: object
+      required: ["type", "bridge", "remote", "vni"]
+      properties:
+        type:      {type: string, enum: [geneve, vxlan]}
+        bridge:    {type: string}
+        remote:    { "$ref": "#/$defs/ip" }
+        vni:       {type: number}
+        netem:     {type: string}
+
+  commands:
+    type: array
+    items:
+      type: object
+      required: ["command"]
+      oneOf: [{required: ["container"]},
+              {required: ["service"]}]
+      properties:
+        service:   {type: string}
+        container: {type: string}
+        command:   {type: string}

package/shadow-cljs.edn

@@ -0,0 +1,33 @@
+;; shadow-cljs configuration
+{:source-paths
+ ["src/"]
+
+ :dependencies
+ [[cljs-bean "1.9.0"]
+  [funcool/promesa "11.0.678"]]
+
+ :builds
+ {:conlink
+  {:target :node-script
+   :main conlink.core/main
+   :output-dir "build/"
+   :output-to "build/conlink.js"
+   ;; Don't try and connect back to shadow-cljs process
+   :devtools {:enabled false :console-support false}
+   :compiler-options
+   {:optimizations :simple
+    :source-map-use-fs-paths true}}
+
+  :net2dot
+  {:target :node-script
+   :main conlink.net2dot/main
+   :output-dir "build/"
+   :output-to "build/net2dot.js"
+   ;; Don't try and connect back to shadow-cljs process
+   :devtools {:enabled false :console-support false}
+   :compiler-options
+   {:optimizations :simple
+    :source-map-use-fs-paths true}}
+
+  }}
+

package/src/conlink/addrs.cljc

@@ -0,0 +1,63 @@
+(ns conlink.addrs
+  (:require [clojure.string :as string]))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Network Address functions
+;; - based on github.com/LonoCloud/clj-protocol
+
+(defn num->string [n base]
+  #?(:cljs  (.toString n base)
+     :clj   (Long/toString n base)))
+
+(defn string->num
+  ([s] (string->num s 10))
+  ([s base] #?(:cljs  (js/parseInt s base)
+               :clj   (Long/parseLong s base))))
+
+(defn octet->int
+  "Convert sequence of octets/bytes `octets` (in MSB first order) into
+  an integer"
+  [octets]
+  (reduce (fn [a o] (+ o (* a 256))) octets))
+
+(defn int->octet
+  "Convert integer `n` into `cnt` octets/bytes (in MSB first order)"
+  [n cnt]
+  (vec (first
+         (reduce (fn [[res x] _] [(conj res (bit-and x 255)) (quot x 256)])
+                 [(list) n]
+                 (range cnt)))))
+
+(defn int->hex
+  "Convert integer `i` into hex string representation"
+  [i]
+  (let [h (num->string i 16)]
+    (if (= 1 (count h)) (str "0" h) h)))
+
+(defn ip->octet "Convert IPv4 string to bytes/octets" [ip]
+  (map string->num (string/split ip #"[.]")))
+
+(defn octet->ip "convert bytes/octets to IPv4 string" [os]
+  (string/join "." os))
+
+(defn mac->octet "Convert MAC addr string to bytes/octets" [mac]
+  (map #(string->num %1 16) (string/split mac #":")))
+
+(defn octet->mac "Convert bytes/octets to MAC addr string" [os]
+  (string/join ":" (map int->hex os)))
+
+
+(defn ip->int "Convert IPv4 string to uint32 value" [ip]
+  (octet->int (ip->octet ip)))
+
+(defn int->ip "Convert IPv4 uint32 value to IPv4 string" [num]
+  (octet->ip (int->octet num 4)))
+
+(defn mac->int "Convert MAC string to int value" [ip]
+  (octet->int (mac->octet ip)))
+
+(defn int->mac "Convert MAC int value to IPv4 string" [num]
+  (octet->mac (int->octet num 6)))
+
+
+