DA: Skip initializing failed_bssids list when eapol failure case

[platform/upstream/connman.git] / test / monitor-services

diff --git a/test/monitor-services b/test/monitor-services
index 015dbd1..c520a8c 100755 (executable)
--- a/test/monitor-services
+++ b/test/monitor-services
@@ -1,13 +1,13 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def extract_values(values):
        val = "{"
-       for key in values.keys():
+       for key in list(values.keys()):
                val += " " + key + "="
                if key in ["Servers", "Excludes"]:
                        val += extract_list(values[key])
@@ -42,17 +42,27 @@ def property_changed(name, value, path):
                val = int(value)
        else:
                val = str(value)
-       print "[%s] %s = %s" % (service, name, val)
+       print("[%s] %s = %s" % (service, name, val))
 
 def services_changed(services, removed):
        for i in services:
                service = i[0][i[0].rfind("/") + 1:]
-               print "[%s] added / update" % (service)
-               for n in i[1].keys():
+               print("[%s] changed" % (service))
+               for n in list(i[1].keys()):
                        property_changed(n, i[1][n], i[0])
        for i in removed:
                service = i[i.rfind("/") + 1:]
-               print "[%s] removed" % (service)
+               print("[%s] removed" % (service))
+
+def technology_added(path, properties):
+       technology = path[path.rfind("/") + 1:]
+       print("[%s] added" % (technology))
+       for n in list(properties.keys()):
+               property_changed(n, properties[n], technology)
+
+def technology_removed(path):
+       technology = path[path.rfind("/") + 1:]
+       print("[%s] removed" % (technology))
 
 if __name__ == '__main__':
        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -61,20 +71,36 @@ if __name__ == '__main__':
 
        bus.add_signal_receiver(property_changed,
                                bus_name="net.connman",
-                               dbus_interface="net.connman.Service",
+                               dbus_interface="net.connman.Manager",
                                signal_name="PropertyChanged",
                                path_keyword="path")
 
-       bus.add_signal_receiver(property_changed,
+       bus.add_signal_receiver(services_changed,
                                bus_name="net.connman",
                                dbus_interface="net.connman.Manager",
+                               signal_name="ServicesChanged")
+
+       bus.add_signal_receiver(property_changed,
+                               bus_name="net.connman",
+                               dbus_interface="net.connman.Service",
                                signal_name="PropertyChanged",
                                path_keyword="path")
 
-       bus.add_signal_receiver(services_changed,
+       bus.add_signal_receiver(technology_added,
                                bus_name="net.connman",
                                dbus_interface="net.connman.Manager",
-                               signal_name="ServicesChanged")
+                               signal_name="TechnologyAdded")
+
+       bus.add_signal_receiver(technology_removed,
+                               bus_name="net.connman",
+                               dbus_interface="net.connman.Manager",
+                               signal_name="TechnologyRemoved")
+
+       bus.add_signal_receiver(property_changed,
+                               bus_name="net.connman",
+                               dbus_interface="net.connman.Technology",
+                               signal_name="PropertyChanged",
+                               path_keyword="path")
 
-       mainloop = gobject.MainLoop()
+       mainloop = GLib.MainLoop()
        mainloop.run()