dnsproxy: Only one copy of the relevant buffers will be made to a TCP request

[framework/connectivity/connman.git] / test / test-manager

diff --git a/test/test-manager b/test/test-manager
index b5a2530..2b4493c 100755 (executable)
--- a/test/test-manager
+++ b/test/test-manager
@@ -9,7 +9,10 @@ def extract_values(values):
                if key in ["PrefixLength"]:
                        val += "%s" % (int(values[key]))
                else:
-                       val += str(values[key])
+                       if key in ["Servers", "Excludes"]:
+                               val += extract_list(values[key])
+                       else:
+                               val += str(values[key])
        val += " }"
        return val
 
@@ -22,112 +25,69 @@ def extract_list(list):
 
 bus = dbus.SystemBus()
 
-manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"),
-                                       "org.moblin.connman.Manager")
+manager = dbus.Interface(bus.get_object("net.connman", "/"),
+                                       "net.connman.Manager")
 
 properties = manager.GetProperties()
 
-def print_properties(key, value):
-       if key == "Profiles":
-               interface = "org.moblin.connman.Profile"
-       elif key == "Devices":
-               interface = "org.moblin.connman.Device"
-       elif key in ["Services", "Providers"]:
-               interface = "org.moblin.connman.Service"
-       elif key == "Technologies":
-               interface = "org.moblin.connman.Technology"
-       else:
-               return
-
-       print "%s" % (key)
-       for path in value:
-               print "    %s" % (path)
-               obj = dbus.Interface(bus.get_object("org.moblin.connman", path),
-                                                               interface)
-
-               properties = obj.GetProperties()
-
-               for key in properties.keys():
-                       if key in ["Devices", "Networks", "Services",
-                                               "Providers", "Technologies"]:
-                               continue
-
-                       elif key in ["Powered", "Scanning", "Connected",
-                                       "Available", "Remember", "Default",
-                                       "Favorite", "Immutable", "AutoConnect",
-                                               "LoginRequired", "SetupRequired",
-                                                       "PassphraseRequired"]:
-                               if properties[key] == dbus.Boolean(1):
-                                       val = "true"
-                               else:
-                                       val = "false"
-
-                       elif key in ["IPv4", "IPv4.Configuration",
-                                       "IPv6", "IPv6.Configuration",
-                                               "Proxy", "Ethernet", "Provider"]:
-                               val = extract_values(properties[key])
-
-                       elif key in ["Nameservers", "Nameservers.Configuration",
-                                       "Domains", "Domains.Configuration"]:
-                               val = extract_list(properties[key])
-
-                       elif key in ["Strength", "Priority"]:
-                               val = int(properties[key])
-                       else:
-                               val = str(properties[key])
-
-                       print "        %s = %s" % (key, val)
-
-               if "Devices" in properties.keys():
-                       list = ""
-                       for path in properties["Devices"]:
-                               val = str(path)
-                               list = list + val[val.rfind("/") + 1:] + " "
-                       print "        Devices = [ %s]" % (list)
-               if "Networks" in properties.keys():
-                       list = ""
-                       for path in properties["Networks"]:
-                               val = str(path)
-                               list = list + val[val.rfind("/") + 1:] + " "
-                       print "        Networks = [ %s]" % (list)
-               if "Services" in properties.keys():
-                       list = ""
-                       for path in properties["Services"]:
-                               val = str(path)
-                               list = list + val[val.rfind("/") + 1:] + " "
-                       print "        Services = [ %s]" % (list)
-               if "Providers" in properties.keys():
-                       list = ""
-                       for path in properties["Providers"]:
-                               val = str(path)
-                               list = list + val[val.rfind("/") + 1:] + " "
-                       print "        Providers = [ %s]" % (list)
-
-
 for key in properties.keys():
-       if key in ["Profiles", "Devices", "Services", "Providers",
-                                                       "Technologies"]:
-               print_properties(key, properties[key])
-       elif key in ["AvailableTechnologies", "EnabledTechnologies",
-                                       "ConnectedTechnologies",
-                               "AvailableDebugs", "EnabledDebugs"]:
-               print "%s" % (key)
-               list = ""
-               for val in properties[key]:
-                       list = list + val + " "
-               print "    [ %s]" % (list)
-       elif key in ["OfflineMode", "Tethering"]:
+       if key in ["OfflineMode", "SessionMode"]:
                print "%s" % (key)
                if properties[key] == dbus.Boolean(1):
                        print "    true"
                else:
                        print "    false"
-       elif key in ["DefaultTechnology"]:
-               print "%s" % (key)
-               if properties[key] == "":
-                       print "    <none>"
-               else:
-                       print "    %s" % (properties[key])
        else:
                print "%s" % (key)
                print "    %s" % (properties[key])
+
+print ("Services")
+services = manager.GetServices()
+
+for (path, properties) in services:
+       print "    %s" % (path)
+       for key in properties.keys():
+               if key in ["Available", "Remember", "Default",
+                               "Favorite", "Immutable", "AutoConnect",
+                                       "LoginRequired",
+                                       "PassphraseRequired"]:
+                       if properties[key] == dbus.Boolean(1):
+                               val = "true"
+                       else:
+                               val = "false"
+
+               elif key in ["IPv4", "IPv4.Configuration",
+                               "IPv6", "IPv6.Configuration",
+                                       "Proxy", "Proxy.Configuration",
+                                               "Ethernet", "Provider"]:
+                       val = extract_values(properties[key])
+
+               elif key in ["Nameservers", "Nameservers.Configuration",
+                               "Domains", "Domains.Configuration",
+                                       "Security"]:
+                       val = extract_list(properties[key])
+
+               elif key in ["Strength", "Priority"]:
+                       val = int(properties[key])
+
+               else:
+                       val = str(properties[key])
+
+               print "        %s = %s" % (key, val)
+
+print ("Technologies")
+technologies = manager.GetTechnologies()
+
+for (path, properties) in technologies:
+       print "    %s" % (path)
+       for key in properties.keys():
+
+               if key in ["Connected", "Powered", "Tethering"]:
+                       if properties[key] == dbus.Boolean(1):
+                               val = "true"
+                       else:
+                               val = "false"
+               else:
+                       val = properties[key]
+
+               print "        %s = %s" % (key, val)