[S] Change in upf-benchmark[master]: testsuites: tunend: Improve setting ip neigh in configure.sh
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39888?usp=email )
Change subject: testsuites: tunend: Improve setting ip neigh in configure.sh ......................................................................
testsuites: tunend: Improve setting ip neigh in configure.sh
* Store MAC address of peers/neighs in variables at the top of the script * Re-arrange order of vars to have values changing depending on specific host together. * Remove neigh before adding it.
Change-Id: I2c8faa5da60ca51337887e3f165ae72024a3ada7 --- M testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh M testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh 2 files changed, 20 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/88/39888/1
diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh index fcadf89..c4a7ae6 100755 --- a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh +++ b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh @@ -1,10 +1,12 @@ #!/bin/bash -xe
# Interface towards UPF: -IFACE_RAN="enp2s0f1np1" -IFACE_CN="enp2s0f0np0" ADDR_GW_CN="172.16.31.200" NUM_ENB=100 +IFACE_RAN="enp2s0f1np1" +IFACE_CN="enp2s0f0np0" +MAC_RAN_PEER="ec:0d:9a:8a:27:52" +MAC_CN_PEER="ec:0d:9a:8a:27:53"
# Disable ethernet flow control: sudo ethtool -A $IFACE_RAN autoneg off rx off tx off @@ -31,15 +33,18 @@
# Set up UPF address: sudo ip addr add 172.16.32.1/24 dev $IFACE_RAN || true +sudo ip link set up dev $IFACE_RAN || true sudo ip addr add 172.16.31.2/24 dev $IFACE_CN || true +sudo ip link set up dev $IFACE_CN || true
# TRex doesn't answer ARPs, so we need to set up the peers: for i in $(seq "2" "$((NUM_ENB + 1))"); do # Delete needed to potentially drop incomplet entries created when trying to Tx traffic: - sudo ip neigh del "$(printf "172.16.32.%02u" "$i")" lladdr ec:0d:9a:8a:27:52 nud permanent dev $IFACE_RAN || true - sudo ip neigh add "$(printf "172.16.32.%02u" "$i")" lladdr ec:0d:9a:8a:27:52 nud permanent dev $IFACE_RAN || true + sudo ip neigh del "$(printf "172.16.32.%02u" "$i")" lladdr $MAC_RAN_PEER nud permanent dev $IFACE_RAN || true + sudo ip neigh add "$(printf "172.16.32.%02u" "$i")" lladdr $MAC_RAN_PEER nud permanent dev $IFACE_RAN || true done -sudo ip neigh add 172.16.31.200 lladdr ec:0d:9a:8a:27:53 nud permanent dev $IFACE_CN || true +sudo ip neigh del 172.16.31.200 lladdr $MAC_CN_PEER nud permanent dev $IFACE_CN || true +sudo ip neigh add 172.16.31.200 lladdr $MAC_CN_PEER nud permanent dev $IFACE_CN || true
# Add route towards HTTP server on the CN side, aka "the Internet" sudo ip route add 48.0.0.0/16 via $ADDR_GW_CN dev $IFACE_CN || true diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh index 350647d..613caf2 100755 --- a/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh +++ b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh @@ -1,11 +1,13 @@ #!/bin/bash -xe
# Interface towards UPF: -IFACE_RAN="enp2s0f1np1" -IFACE_CN="enp2s0f0np0" IFACE_APN="apn-flood" ADDR_GW_CN="172.16.31.200" NUM_ENB=100 +IFACE_RAN="enp2s0f1np1" +IFACE_CN="enp2s0f0np0" +MAC_RAN_PEER="88:e9:a4:3b:f0:48" +MAC_CN_PEER="88:e9:a4:3b:f0:49"
# Disable ethernet flow control: sudo ethtool -A $IFACE_RAN autoneg off rx off tx off @@ -32,15 +34,18 @@
# Set up UPF address: sudo ip addr add 172.16.32.1/24 dev $IFACE_RAN || true +sudo ip link set up dev $IFACE_RAN || true sudo ip addr add 172.16.31.2/24 dev $IFACE_CN || true +sudo ip link set up dev $IFACE_CN || true
# TRex doesn't answer ARPs, so we need to set up the peers: for i in $(seq "2" "$((NUM_ENB + 1))"); do # Delete needed to potentially drop incomplet entries created when trying to Tx traffic: - sudo ip neigh del "$(printf "172.16.32.%02u" "$i")" lladdr ec:0d:9a:8a:27:52 nud permanent dev $IFACE_RAN || true - sudo ip neigh add "$(printf "172.16.32.%02u" "$i")" lladdr ec:0d:9a:8a:27:52 nud permanent dev $IFACE_RAN || true + sudo ip neigh del "$(printf "172.16.32.%02u" "$i")" lladdr $MAC_RAN_PEER nud permanent dev $IFACE_RAN || true + sudo ip neigh add "$(printf "172.16.32.%02u" "$i")" lladdr $MAC_RAN_PEER nud permanent dev $IFACE_RAN || true done -sudo ip neigh add 172.16.31.200 lladdr ec:0d:9a:8a:27:53 nud permanent dev $IFACE_CN || true +sudo ip neigh del 172.16.31.200 lladdr $MAC_CN_PEER nud permanent dev $IFACE_CN || true +sudo ip neigh add 172.16.31.200 lladdr $MAC_CN_PEER nud permanent dev $IFACE_CN || true
# Add route towards HTTP server on the CN side, aka "the Internet" sudo ip route add 48.0.0.0/16 via $ADDR_GW_CN dev $IFACE_CN || true
-
pespin