From 0912a6afb86941928e97719f6a119043952d9078 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 4 Sep 2018 23:08:15 -0500 Subject: [PATCH] auto-t: Convert RSSI agent test to the new API --- autotests/util/iwd.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/autotests/util/iwd.py b/autotests/util/iwd.py index fb0ff481..3a217cce 100755 --- a/autotests/util/iwd.py +++ b/autotests/util/iwd.py @@ -33,6 +33,7 @@ IWD_WSC_INTERFACE = 'net.connman.iwd.WiFiSimpleConfiguration' IWD_SIGNAL_AGENT_INTERFACE = 'net.connman.iwd.SignalLevelAgent' IWD_AP_INTERFACE = 'net.connman.iwd.AccessPoint' IWD_ADHOC_INTERFACE = 'net.connman.iwd.AdHoc' +IWD_STATION_INTERFACE = 'net.connman.iwd.Station' IWD_AGENT_MANAGER_PATH = '/' IWD_TOP_LEVEL_PATH = '/' @@ -213,6 +214,7 @@ class Device(IWDDBusAbstract): ''' _iface_name = IWD_DEVICE_INTERFACE _wps_manager_if = None + _station_if = None @property def _wps_manager(self): @@ -223,6 +225,14 @@ class Device(IWDDBusAbstract): IWD_WSC_INTERFACE) return _wps_manager_if + @property + def _station(self): + if self._station_if is None: + _station_if = dbus.Interface(self._bus.get_object(IWD_SERVICE, + self.device_path), + IWD_STATION_INTERFACE) + return _station_if + @property def device_path(self): ''' @@ -347,18 +357,18 @@ class Device(IWDDBusAbstract): self._wait_for_async_op() def register_signal_agent(self, signal_agent, levels): - self._iface.RegisterSignalLevelAgent(signal_agent.path, - dbus.Array(levels, 'n'), - dbus_interface=self._iface_name, - reply_handler=self._success, - error_handler=self._failure) + self._station.RegisterSignalLevelAgent(signal_agent.path, + dbus.Array(levels, 'n'), + dbus_interface=IWD_STATION_INTERFACE, + reply_handler=self._success, + error_handler=self._failure) self._wait_for_async_op() def unregister_signal_agent(self, signal_agent): - self._iface.UnregisterSignalLevelAgent(signal_agent.path, - dbus_interface=self._iface_name, - reply_handler=self._success, - error_handler=self._failure) + self._station.UnregisterSignalLevelAgent(signal_agent.path, + dbus_interface=IWD_STATION_INTERFACE, + reply_handler=self._success, + error_handler=self._failure) self._wait_for_async_op() def start_ap(self, ssid, psk):