projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: Handling properly Canceled or LaunchBrowser errors
[platform/upstream/connman.git]
/
test
/
list-services
diff --git
a/test/list-services
b/test/list-services
index
83ae2a0
..
6be4945
100755
(executable)
--- a/
test/list-services
+++ b/
test/list-services
@@
-6,30
+6,47
@@
def extract_values(values):
val = "{"
for key in values.keys():
val += " " + key + "="
val = "{"
for key in values.keys():
val += " " + key + "="
- val += str(values[key])
+ if key in ["PrefixLength"]:
+ val += "%s" % (int(values[key]))
+ else:
+ if key in ["Servers", "Excludes"]:
+ val += extract_list(values[key])
+ else:
+ val += str(values[key])
val += " }"
return val
val += " }"
return val
-bus = dbus.SystemBus()
-
-manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"),
-
"org.moblin.connman.Manager"
)
-
-properties = manager.GetProperties()
+def extract_list(list):
+ val = "["
+ for i in list:
+
val += " " + str(i
)
+ val += " ]"
+ return val
-for path in properties["Services"]:
- service = dbus.Interface(bus.get_object("org.moblin.connman", path),
- "org.moblin.connman.Service")
+bus = dbus.SystemBus()
- properties = service.GetProperties()
+manager = dbus.Interface(bus.get_object("net.connman", "/"),
+ "net.connman.Manager")
- print "[ %s ]" % (path)
+for path, properties in manager.GetServices():
+ service = dbus.Interface(bus.get_object("net.connman", path),
+ "net.connman.Service")
+ identifier = path[path.rfind("/") + 1:]
+ print "[ %s ]" % (identifier)
for key in properties.keys():
for key in properties.keys():
- if key in ["IPv4", "IPv4.Configuration", "Ethernet"]:
+ if key in ["IPv4", "IPv4.Configuration",
+ "IPv6", "IPv6.Configuration",
+ "Proxy", "Proxy.Configuration",
+ "Ethernet", "Provider"]:
val = extract_values(properties[key])
val = extract_values(properties[key])
+ elif key in ["Nameservers", "Nameservers.Configuration",
+ "Domains", "Domains.Configuration",
+ "Timeservers", "Timeservers.Configuration",
+ "Security"]:
+ val = extract_list(properties[key])
elif key in ["Favorite", "Immutable", "AutoConnect",
elif key in ["Favorite", "Immutable", "AutoConnect",
-
"Setup
Required", "PassphraseRequired"]:
+
"Login
Required", "PassphraseRequired"]:
if properties[key] == dbus.Boolean(1):
val = "true"
else:
if properties[key] == dbus.Boolean(1):
val = "true"
else:
@@
-37,7
+54,7
@@
for path in properties["Services"]:
elif key in ["Strength"]:
val = int(properties[key])
else:
elif key in ["Strength"]:
val = int(properties[key])
else:
- val =
str(properties[key])
+ val =
properties[key]
print " %s = %s" % (key, val)
print
print " %s = %s" % (key, val)
print