From 64804bee5d917fbc2923d2fbe34391bf65046192 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Thu, 20 Apr 2023 10:56:59 +0200
Subject: [PATCH] src/net: add missing deps when moving between generations

The init_next_gen() function moves us to the next generation, as well as
intialize all data files for expected interfaces in that generation.

However, bridge and lag interfaces have dependendcies that need to be
moved as well.  It is only the test author that knows the expected new
state, so this function only sets up the desired state, without ever
looking at what any previous generation looked like.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/net/test/bridge-lag.sh |  2 ++
 src/net/test/bridge.sh     |  2 ++
 src/net/test/lib.sh        | 12 ++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/src/net/test/bridge-lag.sh b/src/net/test/bridge-lag.sh
index 45b44028..e86a6777 100755
--- a/src/net/test/bridge-lag.sh
+++ b/src/net/test/bridge-lag.sh
@@ -49,6 +49,8 @@ say "Verify moving a port from lag0 to br0"
 
 del_lagport lag0 eth4
 init_next_gen eth0 eth1 eth2 eth3 eth4 eth5 lag0 br0 vlan1
+init_deps br0 eth1 eth2 eth3 lag0
+init_deps lag0 eth5
 add_brport br0 eth4
 
 netdo
diff --git a/src/net/test/bridge.sh b/src/net/test/bridge.sh
index df9e2e74..88cd306c 100755
--- a/src/net/test/bridge.sh
+++ b/src/net/test/bridge.sh
@@ -22,6 +22,7 @@ assert_iface br0
 sep
 say "Verify add another bridge port (eth3)"
 init_next_gen eth0 eth1 eth2 br0
+init_deps br0 eth0 eth1 eth2
 
 create_iface eth3
 add_brport br0 eth3
@@ -37,6 +38,7 @@ say "Verify delete a bridge port (eth1)"
 del_brport br0 eth1
 
 init_next_gen eth0 eth2 eth3 br0
+init_deps br0 eth0 eth2 eth3
 
 netdo
 
diff --git a/src/net/test/lib.sh b/src/net/test/lib.sh
index f3a00506..40c2cc2d 100755
--- a/src/net/test/lib.sh
+++ b/src/net/test/lib.sh
@@ -113,6 +113,18 @@ init_next_gen()
     done
 }
 
+init_deps()
+{
+    parent=$1
+    shift
+
+    mkdir -p "$NET_DIR/$gen/$parent/deps"
+    #shellcheck disable=SC2068
+    for iface in $@; do
+	ln -s "../../$iface" "$NET_DIR/$gen/$parent/deps/$iface"
+    done
+}
+
 setup()
 {
     say "Test start $(date)"