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>
This commit is contained in:
Joachim Wiberg
2023-04-20 21:14:54 +02:00
committed by Tobias Waldekranz
parent c99b5c659a
commit 3edd4c7dff
4 changed files with 10 additions and 12 deletions
+1 -4
View File
@@ -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
+2 -5
View File
@@ -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
+6
View File
@@ -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()
+1 -3
View File
@@ -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