From 6f185cdfb5b33c0d8659cd268d32acccb9554ead Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Mon, 11 Mar 2024 13:31:38 +0100
Subject: [PATCH] confd: refactor gen-interfaces for hybrid bridge/iface setups

Simplify interface generation by collapsing eth_ and ethlike_ifaces to a
single list.  Let gen_iface_json() determine interface type by querying
each interface.  This allows us to create bridge setups also for qemu
use-cases.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/confd/bin/gen-interfaces | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/confd/bin/gen-interfaces b/src/confd/bin/gen-interfaces
index 45e3b961..984f47ed 100755
--- a/src/confd/bin/gen-interfaces
+++ b/src/confd/bin/gen-interfaces
@@ -56,17 +56,26 @@ EOF
     exit 0
 }
 
+iftype()
+{
+    iftype=$(ip -d -j link show "$1" |jq -r .[].parentbus)
+    if [ "$iftype" = "virtio" ]; then
+	echo "infix-if-type:etherlike"
+    else
+	echo "infix-if-type:ethernet"
+    fi
+}
+
 # shellcheck disable=SC3043
 gen_iface_json()
 {
-    local iftype="$1"
-    local ifname="$2"
-    local br="$3"
+    local ifname="$1"
+    local br="$2"
 
     cat <<EOF
       ,{
         "name": "$ifname",
-        "type": "$iftype",
+        "type": "$(iftype "$ifname")",
 EOF
 
     if [ -n "$br" ]; then
@@ -131,20 +140,14 @@ while [ "$1" != "" ]; do
     shift
 done
 
+# All exeternal interfaces
 phys_ifaces=$(ip -d -j link show | jq -r '
          .[] |
          select(.link_type == "ether") |
          select(.group != "internal")  |
          select(has("parentbus")) |
-         select(.parentbus != "virtio") |
-         .ifname' | sort -V)
-virtio_ifaces=$(ip -d -j link show | jq -r '
-         .[] |
-         select(.link_type == "ether") |
-         select(.group != "internal")  |
-         select(has("parentbus")) |
-         select(.parentbus == "virtio") |
          .ifname' | sort -V)
+# All interfaces classified as switch ports
 ports=$(ip -d -j link show group port | jq -r '
          .[] |
          select(.link_type == "ether") |
@@ -152,8 +155,8 @@ ports=$(ip -d -j link show group port | jq -r '
          select(has("parentbus")) |
          .ifname' | sort -V)
 
-eth_ifaces="$(filter_iface_ports "$phys_ifaces" "$ports")"
-ethlike_ifaces="$(filter_iface_ports "$virtio_ifaces" "$ports")"
+# Remaining external interfaces not classified as switch ports
+ifaces="$(filter_iface_ports "$phys_ifaces" "$ports")"
 
 cat <<EOF
 {
@@ -188,9 +191,8 @@ fi
 
 cat <<EOF
       }
-$(for iface in $eth_ifaces; do gen_iface_json "infix-if-type:ethernet" "$iface"; done)
-$(for iface in $ethlike_ifaces; do gen_iface_json "infix-if-type:etherlike" "$iface"; done)
-$(for iface in $ports; do gen_iface_json "infix-if-type:ethernet" "$iface" "$bridge"; done)
+$(for iface in $ifaces; do gen_iface_json "$iface"; done)
+$(for iface in $ports;  do gen_iface_json "$iface" "$bridge"; done)
     ]
 EOF
 if [ "$dhcp" = "true" ] && [ -n "$bridge" ]; then