From 4c8cd7b9a58d9100fe49b16f281ff24d3e7f81db Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 4 Apr 2019 16:08:27 +0200 Subject: modem: Move modem iface to its netns before using it We used to do that once after ofono startup for all iface (modem-netns-setup.py), but then if a modem crashes the interface is re-created on the default netns, and tests fail until manual re-run of modem-netns-setup.py. This way now we always make sure the iface is moved to the expected netns before it is used. Related: OS#3881 Change-Id: I506309c424aa46684c4516a1a0217343ecbf32c6 --- utils/osmo-gsm-tester_netns_setup.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 utils/osmo-gsm-tester_netns_setup.sh (limited to 'utils/osmo-gsm-tester_netns_setup.sh') diff --git a/utils/osmo-gsm-tester_netns_setup.sh b/utils/osmo-gsm-tester_netns_setup.sh new file mode 100755 index 0000000..1600c44 --- /dev/null +++ b/utils/osmo-gsm-tester_netns_setup.sh @@ -0,0 +1,22 @@ +#!/bin/bash -e + +ifname="$1" +netns="$2" +shift +shift + + + +if [ -f "/var/run/netns/${netns}" ]; then + echo "netns $netns already exists" +else + echo "Creating netns $netns" + ip netns add "$netns" +fi + +if [ -d "/sys/class/net/${ifname}" ]; then + echo "Moving iface $ifname to netns $netns" + ip link set $ifname netns $netns +else + ip netns exec $netns ls "/sys/class/net/${ifname}" >/dev/null && echo "iface $ifname already in netns $netns" +fi -- cgit v1.2.3