Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-02 01:02:34 +01:00
Code Releases Activity

auto-t: update utilities to use namespaces

Browse Source
This commit is contained in:
James Prestwood 2020-11-17 12:53:02 -08:00 committed by Denis Kenzior
parent e1e1c4edd1
commit 5a7eb91378
4 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotests/util/ead.py
View File

@ -75,7 +75,7 @@ class AdapterList(collections.Mapping):
del self._dict[path] del self._dict[path]
class EAD(iwd.AsyncOpAbstract): class EAD(iwd.AsyncOpAbstract):
_bus = dbus.SystemBus() _bus = ctx.get_bus()
_object_manager_if = None _object_manager_if = None
_adapters = None _adapters = None

10
autotests/util/hwsim.py
View File

@ -7,6 +7,7 @@ from abc import ABCMeta, abstractmethod
from enum import Enum from enum import Enum
import iwd import iwd
from config import ctx
HWSIM_SERVICE = 'net.connman.hwsim' HWSIM_SERVICE = 'net.connman.hwsim'
HWSIM_RULE_MANAGER_INTERFACE = 'net.connman.hwsim.RuleManager' HWSIM_RULE_MANAGER_INTERFACE = 'net.connman.hwsim.RuleManager'
@ -20,9 +21,8 @@ HWSIM_AGENT_MANAGER_PATH = '/'
class HwsimDBusAbstract(iwd.AsyncOpAbstract): class HwsimDBusAbstract(iwd.AsyncOpAbstract):
__metaclass__ = ABCMeta __metaclass__ = ABCMeta
_bus = dbus.SystemBus() def __init__(self, object_path, properties = None, namespace=ctx):
self._bus = namespace.get_bus()
def __init__(self, object_path, properties = None):
self._object_path = object_path self._object_path = object_path
proxy = self._bus.get_object(HWSIM_SERVICE, self._object_path) proxy = self._bus.get_object(HWSIM_SERVICE, self._object_path)
self._iface = dbus.Interface(proxy, self._iface_name) self._iface = dbus.Interface(proxy, self._iface_name)
@ -256,9 +256,9 @@ class RadioList(collections.Mapping):
return obj return obj
class Hwsim(iwd.AsyncOpAbstract): class Hwsim(iwd.AsyncOpAbstract):
_bus = dbus.SystemBus() def __init__(self, namespace=ctx):
self._bus = namespace.get_bus()
def __init__(self):
self._rule_manager_if = dbus.Interface( self._rule_manager_if = dbus.Interface(
self._bus.get_object(HWSIM_SERVICE, '/'), self._bus.get_object(HWSIM_SERVICE, '/'),
HWSIM_RULE_MANAGER_INTERFACE) HWSIM_RULE_MANAGER_INTERFACE)

49
autotests/util/iwd.py
View File

@ -122,9 +122,9 @@ class AsyncOpAbstract(object):
class IWDDBusAbstract(AsyncOpAbstract): class IWDDBusAbstract(AsyncOpAbstract):
__metaclass__ = ABCMeta __metaclass__ = ABCMeta
_bus = dbus.SystemBus() def __init__(self, object_path = None, properties = None, service=IWD_SERVICE, namespace=ctx):
self._bus = namespace.get_bus()
def __init__(self, object_path = None, properties = None, service=IWD_SERVICE):
self._object_path = object_path self._object_path = object_path
proxy = self._bus.get_object(service, self._object_path) proxy = self._bus.get_object(service, self._object_path)
self._iface = dbus.Interface(proxy, self._iface_name) self._iface = dbus.Interface(proxy, self._iface_name)
@ -190,7 +190,7 @@ class SignalAgent(dbus.service.Object):
def __init__(self, passphrase = None): def __init__(self, passphrase = None):
self._path = '/test/agent/' + str(int(round(time.time() * 1000))) self._path = '/test/agent/' + str(int(round(time.time() * 1000)))
dbus.service.Object.__init__(self, dbus.SystemBus(), self._path) dbus.service.Object.__init__(self, ctx.get_bus(), self._path)
@property @property
def path(self): def path(self):
@ -391,7 +391,7 @@ class Device(IWDDBusAbstract):
''' '''
ordered_networks = [] ordered_networks = []
for bus_obj in self._station.GetOrderedNetworks(): for bus_obj in self._station.GetOrderedNetworks():
ordered_network = OrderedNetwork(bus_obj) ordered_network = OrderedNetwork(bus_obj, self._bus)
ordered_networks.append(ordered_network) ordered_networks.append(ordered_network)
if len(ordered_networks) > 0: if len(ordered_networks) > 0:
@ -407,7 +407,7 @@ class Device(IWDDBusAbstract):
IWD._wait_for_object_condition(self, condition) IWD._wait_for_object_condition(self, condition)
for bus_obj in self._station.GetOrderedNetworks(): for bus_obj in self._station.GetOrderedNetworks():
ordered_network = OrderedNetwork(bus_obj) ordered_network = OrderedNetwork(bus_obj, self._bus)
ordered_networks.append(ordered_network) ordered_networks.append(ordered_network)
if len(ordered_networks) > 0: if len(ordered_networks) > 0:
@ -643,9 +643,8 @@ class KnownNetwork(IWDDBusAbstract):
class OrderedNetwork(object): class OrderedNetwork(object):
'''Represents a network found in the scan''' '''Represents a network found in the scan'''
_bus = dbus.SystemBus() def __init__(self, o_n_tuple, bus):
self._bus = bus
def __init__(self, o_n_tuple):
self._network_object = Network(o_n_tuple[0]) self._network_object = Network(o_n_tuple[0])
self._network_proxy = dbus.Interface(self._bus.get_object(IWD_SERVICE, self._network_proxy = dbus.Interface(self._bus.get_object(IWD_SERVICE,
o_n_tuple[0]), o_n_tuple[0]),
@ -707,7 +706,7 @@ agent_count = 0
class PSKAgent(dbus.service.Object): class PSKAgent(dbus.service.Object):
def __init__(self, passphrases=[], users=[]): def __init__(self, passphrases=[], users=[], namespace=ctx):
global agent_count global agent_count
if type(passphrases) != list: if type(passphrases) != list:
@ -720,7 +719,7 @@ class PSKAgent(dbus.service.Object):
agent_count += 1 agent_count += 1
dbus.service.Object.__init__(self, dbus.SystemBus(), self._path) dbus.service.Object.__init__(self, namespace.get_bus(), self._path)
@property @property
def path(self): def path(self):
@ -882,6 +881,7 @@ class DeviceList(collections.Mapping):
def __init__(self, iwd): def __init__(self, iwd):
self._dict = {} self._dict = {}
self._p2p_dict = {} self._p2p_dict = {}
self._namespace = iwd.namespace
iwd._object_manager.connect_to_signal("InterfacesAdded", iwd._object_manager.connect_to_signal("InterfacesAdded",
self._interfaces_added_handler) self._interfaces_added_handler)
@ -893,9 +893,11 @@ class DeviceList(collections.Mapping):
for path in objects: for path in objects:
for interface in objects[path]: for interface in objects[path]:
if interface == IWD_DEVICE_INTERFACE: if interface == IWD_DEVICE_INTERFACE:
self._dict[path] = Device(path, objects[path][interface]) self._dict[path] = Device(path, objects[path][interface],
namespace=self._namespace)
elif interface == IWD_P2P_INTERFACE: elif interface == IWD_P2P_INTERFACE:
self._p2p_dict[path] = P2PDevice(path, objects[path][interface]) self._p2p_dict[path] = P2PDevice(path, objects[path][interface],
namespace=self._namespace)
def __getitem__(self, key): def __getitem__(self, key):
return self._dict.__getitem__(key) return self._dict.__getitem__(key)
@ -911,9 +913,11 @@ class DeviceList(collections.Mapping):
def _interfaces_added_handler(self, path, interfaces): def _interfaces_added_handler(self, path, interfaces):
if IWD_DEVICE_INTERFACE in interfaces: if IWD_DEVICE_INTERFACE in interfaces:
self._dict[path] = Device(path, interfaces[IWD_DEVICE_INTERFACE]) self._dict[path] = Device(path, interfaces[IWD_DEVICE_INTERFACE],
namespace=self._namespace)
elif IWD_P2P_INTERFACE in interfaces: elif IWD_P2P_INTERFACE in interfaces:
self._p2p_dict[path] = P2PDevice(path, interfaces[IWD_P2P_INTERFACE]) self._p2p_dict[path] = P2PDevice(path, interfaces[IWD_P2P_INTERFACE],
namespace=self._namespace)
def _interfaces_removed_handler(self, path, interfaces): def _interfaces_removed_handler(self, path, interfaces):
if IWD_DEVICE_INTERFACE in interfaces: if IWD_DEVICE_INTERFACE in interfaces:
@ -932,8 +936,6 @@ class IWD(AsyncOpAbstract):
some tests do require starting IWD using this constructor (by passing some tests do require starting IWD using this constructor (by passing
start_iwd_daemon=True) start_iwd_daemon=True)
''' '''
_bus = dbus.SystemBus()
_object_manager_if = None _object_manager_if = None
_agent_manager_if = None _agent_manager_if = None
_iwd_proc = None _iwd_proc = None
@ -941,19 +943,22 @@ class IWD(AsyncOpAbstract):
_default_instance = None _default_instance = None
psk_agent = None psk_agent = None
def __init__(self, start_iwd_daemon = False, iwd_config_dir = '/tmp'): def __init__(self, start_iwd_daemon = False, iwd_config_dir = '/tmp', namespace=ctx):
if start_iwd_daemon and ctx.is_process_running('iwd'): self.namespace = namespace
raise Exception("IWD requested to start but is already running") self._bus = namespace.get_bus()
if start_iwd_daemon: if start_iwd_daemon:
self._iwd_proc = ctx.start_iwd(iwd_config_dir) if self.namespace.is_process_running('iwd'):
raise Exception("IWD requested to start but is already running")
self._iwd_proc = self.namespace.start_iwd(iwd_config_dir)
tries = 0 tries = 0
while not self._bus.name_has_owner(IWD_SERVICE): while not self._bus.name_has_owner(IWD_SERVICE):
if not ctx.args.gdb: if not ctx.args.gdb:
if tries > 200: if tries > 200:
if start_iwd_daemon: if start_iwd_daemon:
ctx.stop_process(self._iwd_proc) self.namespace.stop_process(self._iwd_proc)
self._iwd_proc = None self._iwd_proc = None
raise TimeoutError('IWD has failed to start') raise TimeoutError('IWD has failed to start')
tries += 1 tries += 1
@ -978,7 +983,7 @@ class IWD(AsyncOpAbstract):
self._devices = None self._devices = None
if self._iwd_proc is not None: if self._iwd_proc is not None:
ctx.stop_process(self._iwd_proc) self.namespace.stop_process(self._iwd_proc)
self._iwd_proc = None self._iwd_proc = None
@property @property

5
autotests/util/ofono.py
View File

@ -1,12 +1,13 @@
import dbus import dbus
import time import time
from gi.repository import GLib from gi.repository import GLib
from config import ctx
SIM_AUTH_IFACE = 'org.ofono.SimAuthentication' SIM_AUTH_IFACE = 'org.ofono.SimAuthentication'
class Ofono(dbus.service.Object): class Ofono(dbus.service.Object):
def __init__(self): def __init__(self, namespace=ctx):
self._bus = dbus.SystemBus() self._bus = namespace.get_bus()
tries = 0 tries = 0