conlink 2.1.0 → 2.4.0

package/link-mirred.sh

@@ -34,41 +34,20 @@ die()  { warn "ERROR: ${*}"; exit 1; }
 add_ingress() {
   local IF=$1 res=
 
-  res=$(tc qdisc show dev ${IF} 2>&1)
-  case "${res}" in
-    *"qdisc ingress ffff:"*)
-      info "${IF0} already has ingress qdisc"
-      ;;
-    ""|*"qdisc noqueue"*)
-      info "Adding ingress qdisc to ${IF}"
-      tc qdisc add dev "${IF}" ingress \
-        || die "Could not add ingress qdisc to ${IF}"
-      ;;
-    *)
-      die "${IF} has invalid ingress qdisc or could not be queried"
-      ;;
-  esac
+  info "Adding ingress qdisc to ${IF}"
+  tc qdisc replace dev "${IF}" ingress \
+    || die "Could not add ingress qdisc to ${IF}"
 }
 
 # Idempotently add mirred filter redirect rule to an interface
 add_mirred() {
   local IF0=$1 IF1=$2 res=
 
-  res=$(tc filter show dev ${IF0} parent ffff: 2>&1)
-  case "${res}" in
-    *"action order 1: mirred (Egress Redirect to device ${IF1}"*)
-      info "${IF0} already has filter redirect action"
-      ;;
-    "")
-      info "Adding filter redirect action from ${IF0} to ${IF1}"
-      tc filter add dev ${IF0} parent ffff: protocol all u32 match u8 0 0 action \
-        mirred egress redirect dev ${IF1} \
-        || die "Could not add filter redirect action from ${IF0} to ${IF1}"
-      ;;
-    *)
-      die "${IF0} has invalid filter redirect action or could not be queried"
-      ;;
-  esac
+  info "Adding filter redirect action from ${IF0} to ${IF1}"
+  tc filter del dev ${IF0} root
+  tc filter replace dev ${IF0} parent ffff: protocol all u32 match u8 0 0 action \
+    mirred egress redirect dev ${IF1} \
+    || die "Could not add filter redirect action from ${IF0} to ${IF1}"
 }
 
 # Parse arguments

package/mdc

@@ -17,21 +17,18 @@ LS=$(which ls)
 RESOLVE_DEPS="${RESOLVE_DEPS-./node_modules/@lonocloud/resolve-deps/resolve-deps.py}"
 DOCKER_COMPOSE="${DOCKER_COMPOSE:-docker-compose}"
 
-[ -f "${RESOLVE_DEPS}" ] || die "Missing ${RESOLVE_DEPS}. Perhaps 'npm install'?"
+which ${RESOLVE_DEPS} >/dev/null 2>/dev/null \
+  || die "Missing ${RESOLVE_DEPS}. Perhaps 'npm install'?"
+
+# Resolve mode directory paths
+
 MODE_SPEC="${1}"; shift
-if [ "${RESOLVE_DEPS}" ]; then
-    MODES="$(${RESOLVE_DEPS} "${MODES_DIR}" ${MODE_SPEC})"
-else
-    MODES="${MODE_SPEC//,/ }"
-fi
+RESOLVED_MODES="$(${RESOLVE_DEPS} --path "${MODES_DIR}" --format=paths ${MODE_SPEC})"
 
-echo >&2 "MODES:    ${MODES}"
-vecho "ENV_FILE: ${ENV_FILE}"
+# Create base (empty) compose file to anchor mode relative paths
+# to the same root directory.  Create files dir.
 
-declare -A FINISHED
 COMPOSE_FILE=./.compose-empty.yaml
-COMPOSE_PROFILES=
-MDC_MODE_DIRS=
 cat /dev/null > ${ENV_FILE}-mdc-tmp
 echo -e "version: '2.4'\nservices: {}" > ./.compose-empty.yaml
 
@@ -42,19 +39,25 @@ esac
 [ -d "${MDC_FILES_DIR}" ] && rm -r${VERBOSE:+v} ${MDC_FILES_DIR}/
 mkdir -p "${MDC_FILES_DIR}"
 
-for mode in ${MODES}; do
+# Incorporate modes' compose config, env, and files
+
+declare -A FINISHED
+COMPOSE_PROFILES=
+MDC_MODE_NAMES=
+MDC_MODE_DIRS=
+for resolved in ${RESOLVED_MODES}; do
+    mode=${resolved%=*}
+    path=${resolved#*=}
+
     # Only process each mode once
     [ "${FINISHED[${mode}]}" ] && continue
     FINISHED["${mode}"]=1
 
-    # mode dir must exist
-    [ -d "${MODES_DIR}/${mode}" ] || \
-        die "No mode dir found for ${mode}"
-
-    MDC_MODE_DIRS="${MDC_MODE_DIRS},${MODES_DIR}/${mode}"
+    MDC_MODE_NAMES="${MDC_MODE_NAMES} ${mode}"
+    MDC_MODE_DIRS="${MDC_MODE_DIRS},${path}"
 
     # mode can refer to a compose file in multiple ways
-    cfiles="${MODES_DIR}/${mode}/compose.yaml ${MODES_DIR}/${mode}/compose.yml ${MODES_DIR}/${mode}/docker-compose.yaml ${MODES_DIR}/${mode}/docker-compose.yml"
+    cfiles="${path}/compose.yaml ${path}/compose.yml ${path}/docker-compose.yaml ${path}/docker-compose.yml"
     for cfile in ${cfiles}; do
         if [ -e "${cfile}" ]; then
             COMPOSE_FILE="${COMPOSE_FILE}:${cfile}"
@@ -66,27 +69,35 @@ for mode in ${MODES}; do
     COMPOSE_PROFILES="${COMPOSE_PROFILES},MODE_${mode}"
 
     # if there is a mode specific env file then include it
-    efiles="${MODES_DIR}/${mode}/env ${MODES_DIR}/${mode}/.env"
+    efiles="${path}/env ${path}/.env"
     for efile in ${efiles}; do
         if [ -e "${efile}" ]; then
-            echo "### mdc begin mode ${mode}" >> ${ENV_FILE}-mdc-tmp
+            echo "### mdc begin mode ${mode} (${efile})" >> ${ENV_FILE}-mdc-tmp
             vecho "cat ${efile} >> ${ENV_FILE}-mdc-tmp"
             cat ${efile} >> ${ENV_FILE}-mdc-tmp
-            echo "### mdc end mode ${mode}" >> ${ENV_FILE}-mdc-tmp
+            echo >> ${ENV_FILE}-mdc-tmp
+            echo "### mdc end mode ${mode} (${efile})" >> ${ENV_FILE}-mdc-tmp
         fi
     done
 
     # if there are mode specific files then copy them to MDC_FILES_DIR
-    if [ -d "${MODES_DIR}/${mode}" ]; then
-        for vfd in $(cd ${MODES_DIR}/${mode} && $LS -d */files 2>/dev/null || true); do
+    if [ -d "${path}" ]; then
+        for vfd in $(cd ${path} && $LS -d */files 2>/dev/null || true); do
             dest=${MDC_FILES_DIR}/${vfd%/files}
             mkdir -p ${dest}
-            vecho cp -a ${MODES_DIR}/${mode}/${vfd}/* ${dest}
-            cp -a ${MODES_DIR}/${mode}/${vfd}/* ${dest}
+            vecho cp -a ${path}/${vfd}/* ${dest}
+            cp -a ${path}/${vfd}/* ${dest}
         done
     fi
 done
 
+vecho
+
+# Summarize and set env
+
+echo >&2 "MODES: ${MDC_MODE_NAMES}"
+vecho "ENV_FILE: ${ENV_FILE}"
+
 COMPOSE_FILE="${COMPOSE_FILE#:}"
 vecho "COMPOSE_FILE: ${COMPOSE_FILE}"
 echo "COMPOSE_FILE=${COMPOSE_FILE}" >> ${ENV_FILE}-mdc-tmp
@@ -100,6 +111,8 @@ MDC_MODE_DIRS="${MDC_MODE_DIRS#,}"
 vecho "MDC_MODE_DIRS: ${MDC_MODE_DIRS}"
 echo "MDC_MODE_DIRS=\"${MDC_MODE_DIRS}\"" >> ${ENV_FILE}-mdc-tmp
 
+vecho
+
 vecho mv ${ENV_FILE}-mdc-tmp ${ENV_FILE}
 mv ${ENV_FILE}-mdc-tmp ${ENV_FILE}
 

package/net2dot.cljs

@@ -29,7 +29,7 @@
       (S/replace #"[*]" "_STAR_")
       (S/replace #"[$]" "_DOLLAR_")
       (S/replace #"[{]" "_LCURLY_")
-      (S/replace #"[}]" "_LCURLY_")
+      (S/replace #"[}]" "_RCURLY_")
       (S/replace #"[ ]" "_SPACE_")))
 
 (defn node-props [label props]
@@ -61,7 +61,7 @@
                   #(->> (subgraph conlink (str "cluster_bridge_" %2)
                                   %2 BRIDGE-PROPS)
                         (assoc %1 %2))
-                  {} (keep :bridge (:links network-config)))
+                  {} (map :bridge (keep :bridge (:links network-config))))
         services (reduce
                    #(->> (subgraph host (str "cluster_service_" (dot-id %2))
                                    (str "service '" (name %2) "'") SVC-PROPS)
@@ -85,7 +85,7 @@
                                    "-" (name dev)))
                 out-id (str "out-" outer-dev)
                 out-parent (condp = (keyword base)
-                             :conlink (get bridges bridge)
+                             :conlink (get bridges (:bridge bridge))
                              :host host)
                 {:keys [type vlanid]} link
                 [elabel iprops] (if (= "host" base)

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "conlink",
-  "version": "2.1.0",
+  "version": "2.4.0",
   "description": "conlink -  Declarative Low-Level Networking for Containers",
   "repository": "https://github.com/LonoCloud/conlink",
   "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
-    "@lonocloud/resolve-deps": "^0.0.2",
+    "@lonocloud/resolve-deps": "^0.1.0",
     "ajv": "^8.12.0",
     "dockerode": "^3.3.4",
     "nbb": "^1.2.179",
@@ -14,6 +14,7 @@
     "yaml": "^2.2.1"
   },
   "devDependencies": {
+    "@lonocloud/dctest": "0.1.1",
     "shadow-cljs": "^2.25.7",
     "source-map-support": "^0.5.21"
   }

package/schema.yaml

@@ -3,6 +3,7 @@ $defs:
   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}$"}
+  fwd:  {type: string, pattern: "^[0-9]{1,5}:[0-9]{1,5}/(tcp|udp)$"}
 
 type: object
 additionalProperties: false
@@ -40,11 +41,18 @@ properties:
         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}
+        route:
+          oneOf: [{type: string},
+                  {type: array, items: {type: string}}]
+        forward:
+          oneOf: [{ "$ref": "#/$defs/fwd" },
+                  {type: array, items: { "$ref": "#/$defs/fwd" }}]
+        netem:
+          oneOf: [{type: string},
+                  {type: array, items: {type: string}}]
 
   bridges:
     type: array
@@ -63,7 +71,9 @@ properties:
         bridge:    {type: string}
         remote:    { "$ref": "#/$defs/ip" }
         vni:       {type: number}
-        netem:     {type: string}
+        netem:
+          oneOf: [{type: string},
+                  {type: array, items: {type: string}}]
 
   commands:
     type: array

package/scripts/copy.sh

@@ -46,7 +46,8 @@ dst_dir="${1}"; shift || die 2 "Usage: ${0} [-T|--template] SRC_DIR DST_DIR"
 done
 
 if [ "${*}" ]; then
-    exec "${@}"
+  echo "Running: ${*}"
+  exec "${@}"
 else
-    true
+  true
 fi

package/scripts/wait.sh

@@ -69,5 +69,5 @@ done
 
 if [ "${*}" ]; then
   echo "Running: ${*}"
-  exec ${*}
+  exec "${@}"
 fi