test-manager: Update test-manager with Technology changes

test-manager now gets the full set of technology paths and
properties from Manager GetTechnologies() D-Bus method call.

Fixes BMC#24637

diff --git a/test/test-manager b/test/test-manager
index 8bbcd7f..b46a174 100755 (executable)
--- a/test/test-manager
+++ b/test/test-manager
@@ -35,8 +35,6 @@ def print_properties(key, value):
                interface = "net.connman.Profile"
        elif key == "Services":
                interface = "net.connman.Service"
-       elif key == "Technologies":
-               interface = "net.connman.Technology"
        else:
                return
 
@@ -49,11 +47,10 @@ def print_properties(key, value):
                properties = obj.GetProperties()
 
                for key in properties.keys():
-                       if key in ["Services", "Technologies"]:
+                       if key in ["Services"]:
                                continue
 
-                       elif key in ["Powered", "Scanning", "Connected",
-                                       "Available", "Remember", "Default",
+                       elif key in ["Available", "Remember", "Default",
                                        "Favorite", "Immutable", "AutoConnect",
                                                "LoginRequired",
                                                "PassphraseRequired"]:
@@ -76,11 +73,6 @@ def print_properties(key, value):
                        elif key in ["Strength", "Priority"]:
                                val = int(properties[key])
 
-                       elif key in ["Tethering"]:
-                               if properties[key] == dbus.Boolean(1):
-                                       val = "true"
-                               else:
-                                       val = "false"
                        else:
                                val = str(properties[key])
 
@@ -95,28 +87,38 @@ def print_properties(key, value):
 
 
 for key in properties.keys():
-       if key in ["Profiles", "Services", "Technologies"]:
+       if key in ["Profiles", "Services"]:
                print_properties(key, properties[key])
-       elif key in ["AvailableTechnologies", "EnabledTechnologies",
-                                       "ConnectedTechnologies",
-                               "AvailableDebugs", "EnabledDebugs"]:
+       elif key in ["AvailableDebugs", "EnabledDebugs"]:
                print "%s" % (key)
                list = ""
                for val in properties[key]:
                        list = list + val + " "
                print "    [ %s]" % (list)
-       elif key in ["OfflineMode", "Tethering"]:
+       elif key in ["OfflineMode"]:
                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 ("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)