<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11461">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">utils: Introduce modem-netns-setup.py<br><br>Used to quickly set modem net interfaces into their own net namespace<br>(named after modem USB ID path).<br><br>The idea is that since osmo-gsm-tester ofono modem.py knowns the USB<br>path from a modem (path yml attr), it can infer the netns from it and<br>run a ping process inside it.<br><br>Related: OS#2308<br>Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1<br>---<br>A utils/modem-netns-setup.py<br>1 file changed, 87 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/utils/modem-netns-setup.py b/utils/modem-netns-setup.py</span><br><span>new file mode 100755</span><br><span>index 0000000..e0645d1</span><br><span>--- /dev/null</span><br><span>+++ b/utils/modem-netns-setup.py</span><br><span>@@ -0,0 +1,87 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span style="color: hsl(120, 100%, 40%);">+# Pau Espin Pedrol <pespin@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+# MIT</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# manage netns for ofono modems</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+import os</span><br><span style="color: hsl(120, 100%, 40%);">+import sys</span><br><span style="color: hsl(120, 100%, 40%);">+import subprocess</span><br><span style="color: hsl(120, 100%, 40%);">+import usb.core</span><br><span style="color: hsl(120, 100%, 40%);">+import usb.util</span><br><span style="color: hsl(120, 100%, 40%);">+from pprint import pprint</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def get_path_ids(bus, port_numbers):</span><br><span style="color: hsl(120, 100%, 40%);">+ port_numbers = [str(port) for port in port_numbers]</span><br><span style="color: hsl(120, 100%, 40%);">+ ports = '.'.join(port_numbers)</span><br><span style="color: hsl(120, 100%, 40%);">+ return '{}-{}'.format(bus, ports)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def get_usb_dir(bus, port_numbers):</span><br><span style="color: hsl(120, 100%, 40%);">+ return '/sys/bus/usb/devices/' + get_path_ids(bus, port_numbers) + '/'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def get_net_from_usb(bus, port_numbers):</span><br><span style="color: hsl(120, 100%, 40%);">+ net_ifaces = []</span><br><span style="color: hsl(120, 100%, 40%);">+ path = get_usb_dir(bus, port_numbers)</span><br><span style="color: hsl(120, 100%, 40%);">+ path_ids = get_path_ids(bus, port_numbers)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_interfaces = [f for f in os.listdir(path) if f.startswith(path_ids)]</span><br><span style="color: hsl(120, 100%, 40%);">+ for usb_iface in usb_interfaces:</span><br><span style="color: hsl(120, 100%, 40%);">+ listdir = [f for f in os.listdir(path + usb_iface) if f == ('net')]</span><br><span style="color: hsl(120, 100%, 40%);">+ if listdir:</span><br><span style="color: hsl(120, 100%, 40%);">+ # found a net iface</span><br><span style="color: hsl(120, 100%, 40%);">+ net_ifaces += os.listdir(path + usb_iface + '/net/')</span><br><span style="color: hsl(120, 100%, 40%);">+ return net_ifaces</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def move_modem_to_netns(usb_path_id, net_li):</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(net_li) == 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: Device has no net ifaces, skipping" %(usb_path_id))</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.exists("/var/run/netns/%s" % usb_path_id):</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: Creating netns" % (usb_path_id))</span><br><span style="color: hsl(120, 100%, 40%);">+ subprocess.check_call(["ip", "netns", "add", usb_path_id])</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: netns already exists" % (usb_path_id))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for netif in net_li:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: Moving iface %s to netns" % (usb_path_id, netif))</span><br><span style="color: hsl(120, 100%, 40%);">+ subprocess.check_call(["ip", "link", "set", netif, "netns", usb_path_id])</span><br><span style="color: hsl(120, 100%, 40%);">+ # iface Must be set up AFTER pdp ctx is activated, otherwise we get no DHCP response.</span><br><span style="color: hsl(120, 100%, 40%);">+ #print("%s: Setting up iface %s" % (usb_path_id, netif))</span><br><span style="color: hsl(120, 100%, 40%);">+ #subprocess.check_call(["ip", "netns", "exec", usb_path_id, "ip", "link", "set", "dev", netif, "up"])</span><br><span style="color: hsl(120, 100%, 40%);">+ #subprocess.check_call(["ip", "netns", "exec", usb_path_id, "udhcpc", "-i", netif])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def delete_modem_netns(usb_path_id):</span><br><span style="color: hsl(120, 100%, 40%);">+ if os.path.exists("/var/run/netns/%s" % usb_path_id):</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: Deleting netns" % (usb_path_id))</span><br><span style="color: hsl(120, 100%, 40%);">+ subprocess.check_call(["ip", "netns", "delete", usb_path_id])</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: netns doesn't exist" % (usb_path_id))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def print_help():</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Usage: %s start|stop" % sys.argv[0])</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if __name__ == '__main__':</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(sys.argv) != 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ print_help()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ USB_DEVS = [dev for dev in usb.core.find(find_all=True)]</span><br><span style="color: hsl(120, 100%, 40%);">+ RESULT = {}</span><br><span style="color: hsl(120, 100%, 40%);">+ for device in USB_DEVS:</span><br><span style="color: hsl(120, 100%, 40%);">+ result = {}</span><br><span style="color: hsl(120, 100%, 40%);">+ if not device.port_numbers:</span><br><span style="color: hsl(120, 100%, 40%);">+ continue</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_path_id = get_path_ids(device.bus, device.port_numbers)</span><br><span style="color: hsl(120, 100%, 40%);">+ net_li = get_net_from_usb(device.bus, device.port_numbers)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if sys.argv[1] == "start":</span><br><span style="color: hsl(120, 100%, 40%);">+ move_modem_to_netns(usb_path_id, net_li)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif sys.argv[1] == "stop":</span><br><span style="color: hsl(120, 100%, 40%);">+ delete_modem_netns(usb_path_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ print_help()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11461">change 11461</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11461"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1 </div>
<div style="display:none"> Gerrit-Change-Number: 11461 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>