service: Simplify nameserver route adding and removing

[framework/connectivity/connman.git] / test / monitor-services

diff --git a/test/monitor-services b/test/monitor-services
index 8a05c2f..9476bf8 100755 (executable)
--- a/test/monitor-services
+++ b/test/monitor-services
@@ -25,17 +25,18 @@ def extract_list(list):
 
 def property_changed(name, value, path):
        service = path[path.rfind("/") + 1:]
-       if name in ["Profiles", "Services", "Providers", "Technologies"]
+       if name in ["Services"]:
                val = "["
                for i in value:
                        val = val + " " + i[i.rfind("/") + 1:]
                val = val + " ]"
        elif name in ["IPv4", "IPv4.Configuration",
                        "IPv6", "IPv6.Configuration",
-                       "Proxy", "Proxy.Configuration", "Ethernet"]:
+                       "Proxy", "Proxy.Configuration", "Ethernet", "Provider"]:
                val = extract_values(value)
        elif name in ["Nameservers", "Nameservers.Configuration",
-                                       "Domains", "Domains.Configuration"]:
+                       "Domains", "Domains.Configuration",
+                       "Timeservers", "Timeservers.Configuration", "Security"]:
                val = extract_list(value)
        elif name in ["Strength", "Priority"]:
                val = int(value)
@@ -43,15 +44,62 @@ def property_changed(name, value, path):
                val = str(value)
        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] changed" % (service)
+               for n in i[1].keys():
+                       property_changed(n, i[1][n], i[0])
+       for i in removed:
+               service = i[i.rfind("/") + 1:]
+               print "[%s] removed" % (service)
+
+def technology_added(path, properties):
+       technology = path[path.rfind("/") + 1:]
+       print "[%s] added" % (technology)
+       for n in 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)
 
        bus = dbus.SystemBus()
 
        bus.add_signal_receiver(property_changed,
-                               bus_name="org.moblin.connman",
-                               dbus_interface="org.moblin.connman.Service",
-                               signal_name = "PropertyChanged",
+                               bus_name="net.connman",
+                               dbus_interface="net.connman.Manager",
+                               signal_name="PropertyChanged",
+                               path_keyword="path")
+
+       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(technology_added,
+                               bus_name="net.connman",
+                               dbus_interface="net.connman.Manager",
+                               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()