Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 17:59:25 +01:00
Code Releases Activity

test-runner: allow EAD-based autotests

Browse Source 
The virtual environment changed slightly adding two network adatpers
which are connected to the same backend so they can communicate with
each other (basically connected to a switch). The hostapd command
line was modified to allow no interfaces to be passed in which lets
us create zero radios but still specify a radius_config file.
This commit is contained in:
James Prestwood 2020-09-17 14:32:46 -07:00 committed by Denis Kenzior
parent c707bee6ac
commit 9897efe75c
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/test-runner
View File

@ -113,6 +113,7 @@ mount_table = [
MountInfo('tmpfs', '/dev/shm', 'mode=1777', MS_NOSUID|MS_NODEV|MS_STRICTATIME), MountInfo('tmpfs', '/dev/shm', 'mode=1777', MS_NOSUID|MS_NODEV|MS_STRICTATIME),
MountInfo('tmpfs', '/run', 'mode=0755', MS_NOSUID|MS_NODEV|MS_STRICTATIME), MountInfo('tmpfs', '/run', 'mode=0755', MS_NOSUID|MS_NODEV|MS_STRICTATIME),
MountInfo('tmpfs', '/var/lib/iwd', 'mode=0755', 0), MountInfo('tmpfs', '/var/lib/iwd', 'mode=0755', 0),
MountInfo('tmpfs', '/var/lib/ead', 'mode=0755', 0),
MountInfo('tmpfs', '/tmp', '', 0), MountInfo('tmpfs', '/tmp', '', 0),
MountInfo('tmpfs', '/usr/share/dbus-1', 'mode=0755', MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME), MountInfo('tmpfs', '/usr/share/dbus-1', 'mode=0755', MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME),
MountInfo('debugfs', '/sys/kernel/debug', '', 0) MountInfo('debugfs', '/sys/kernel/debug', '', 0)
@ -377,6 +378,9 @@ class Hostapd:
print("Initializing hostapd instances") print("Initializing hostapd instances")
ctx.start_process(['ip', 'link', 'set', 'eth0', 'up'], wait=True)
ctx.start_process(['ip', 'link', 'set', 'eth1', 'up'], wait=True)
self.global_ctrl_iface = '/var/run/hostapd/ctrl' self.global_ctrl_iface = '/var/run/hostapd/ctrl'
self.instances = [HostapdInstance(c, r) for c, r in zip(configs, radios)] self.instances = [HostapdInstance(c, r) for c, r in zip(configs, radios)]
@ -384,7 +388,10 @@ class Hostapd:
ifaces = [rad.interface.name for rad in radios] ifaces = [rad.interface.name for rad in radios]
ifaces = ','.join(ifaces) ifaces = ','.join(ifaces)
args = ['hostapd', '-i', ifaces, '-g', self.global_ctrl_iface] args = ['hostapd', '-g', self.global_ctrl_iface]
if ifaces:
args.extend(['-i', ifaces])
# #
# Config files should already be present in /tmp. This appends # Config files should already be present in /tmp. This appends
@ -1034,6 +1041,7 @@ def run_tests():
os.environ['PATH'] = '%s/src' % args.testhome os.environ['PATH'] = '%s/src' % args.testhome
os.environ['PATH'] += ':%s/tools' % args.testhome os.environ['PATH'] += ':%s/tools' % args.testhome
os.environ['PATH'] += ':%s/client' % args.testhome os.environ['PATH'] += ':%s/client' % args.testhome
os.environ['PATH'] += ':%s/wired' % args.testhome
os.environ['PATH'] += ':' + args.path os.environ['PATH'] += ':' + args.path
sys.path.append(args.testhome + '/autotests/util') sys.path.append(args.testhome + '/autotests/util')
@ -1219,7 +1227,7 @@ class Main:
'-machine', 'type=q35,accel=kvm:tcg', '-machine', 'type=q35,accel=kvm:tcg',
'-nodefaults', '-no-user-config', '-monitor', 'none', '-nodefaults', '-no-user-config', '-monitor', 'none',
'-display', 'none', '-m', '192M', '-nographic', '-vga', '-display', 'none', '-m', '192M', '-nographic', '-vga',
'none', '-net', 'none', '-no-acpi', '-no-hpet', 'none', '-no-acpi', '-no-hpet',
'-no-reboot', '-fsdev', '-no-reboot', '-fsdev',
'local,id=fsdev-root,path=/,readonly,security_model=none,multidevs=remap', 'local,id=fsdev-root,path=/,readonly,security_model=none,multidevs=remap',
'-device', '-device',
@ -1238,6 +1246,13 @@ class Main:
'-cpu', 'host' '-cpu', 'host'
] ]
# Add two ethernet devices for testing EAD
qemu_cmdline.extend([
'-net', 'nic,model=virtio',
'-net', 'nic,model=virtio',
'-net', 'user'
])
if usb_adapters: if usb_adapters:
for bus, addr in [s.split(',') for s in usb_adapters]: for bus, addr in [s.split(',') for s in usb_adapters]:
qemu_cmdline.extend(['-usb', qemu_cmdline.extend(['-usb',