From 3edd4c7dff13e9e48dec8cd61d728c445c9b6336 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Thu, 20 Apr 2023 10:47:57 +0200
Subject: [PATCH] src/net: let init_next_gen init new generation with ifaces

The (optional) interface list represent the expected state in the new
generation.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/net/test/bridge-lag.sh        | 5 +----
 src/net/test/bridge.sh            | 7 ++-----
 src/net/test/lib.sh               | 6 ++++++
 src/net/test/three-independent.sh | 4 +---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/net/test/bridge-lag.sh b/src/net/test/bridge-lag.sh
index 86f82205..836800f1 100755
--- a/src/net/test/bridge-lag.sh
+++ b/src/net/test/bridge-lag.sh
@@ -51,10 +51,7 @@ assert_lag_ports lag0 true eth4 eth5
 say "Verify moving a port from lag0 to br0"
 
 del_lagport lag0 eth4
-
-init_next_gen
-create_iface_data eth4
-create_iface_data br0
+init_next_gen eth0 eth1 eth2 eth3 eth4 eth5 lag0 br0 vlan1
 add_brport br0 eth4
 
 netdo
diff --git a/src/net/test/bridge.sh b/src/net/test/bridge.sh
index 962789b9..df9e2e74 100755
--- a/src/net/test/bridge.sh
+++ b/src/net/test/bridge.sh
@@ -21,8 +21,7 @@ assert_iface br0
 ################################################
 sep
 say "Verify add another bridge port (eth3)"
-init_next_gen
-create_iface_data br0
+init_next_gen eth0 eth1 eth2 br0
 
 create_iface eth3
 add_brport br0 eth3
@@ -37,9 +36,7 @@ sep
 say "Verify delete a bridge port (eth1)"
 del_brport br0 eth1
 
-init_next_gen
-create_iface_data br0
-create_iface_data eth1
+init_next_gen eth0 eth2 eth3 br0
 
 netdo
 
diff --git a/src/net/test/lib.sh b/src/net/test/lib.sh
index 916442d1..f3a00506 100755
--- a/src/net/test/lib.sh
+++ b/src/net/test/lib.sh
@@ -100,11 +100,17 @@ trapit()
     done
 }
 
+# shellcheck disable=SC2120
 init_next_gen()
 {
     _=$((gen += 1))
     mkdir -p "$NET_DIR/$gen"
     echo $gen > "$NET_DIR/next"
+
+    # shellcheck disable=SC2068
+    for iface in $@; do
+	create_iface_data "$iface"
+    done
 }
 
 setup()
diff --git a/src/net/test/three-independent.sh b/src/net/test/three-independent.sh
index c5a712b7..26c48be7 100755
--- a/src/net/test/three-independent.sh
+++ b/src/net/test/three-independent.sh
@@ -20,9 +20,7 @@ assert_iface eth2 10.0.2.1/24
 sep
 say "Verify removal of an interface"
 remove_iface eth1
-init_next_gen
-create_iface_data eth0
-create_iface_data eth2
+init_next_gen eth0 eth2
 
 netdo