---
test/get-services | 9 ++++++---
test/list-providers | 8 ++++++--
test/list-services | 8 ++++++--
test/monitor-services | 10 +++++++---
test/test-manager | 8 ++++++--
5 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/test/get-services b/test/get-services
index d337e0c..b4b849a 100755
--- a/test/get-services
+++ b/test/get-services
@@ -6,7 +6,10 @@ def extract_values(values):
val = "{"
for key in values.keys():
val += " " + key + "="
- val += str(values[key])
+ if key in ["Ignore"]:
+ val += extract_list(values[key])
+ else:
+ val += str(values[key])
val += " }"
return val
@@ -33,8 +36,8 @@ for entry in services:
for key in properties.keys():
if key in ["IPv4", "IPv4.Configuration",
"IPv6", "IPv6.Configuration",
- "Proxy", "Ethernet",
- "Provider"]:
+ "Proxy", "Ethernet", "Provider",
+ "Proxy.Configuration"]:
val = extract_values(properties[key])
elif key in ["Nameservers", "Nameservers.Configuration",
"Domains", "Domains.Configuration"]:
diff --git a/test/list-providers b/test/list-providers
index 94375d5..6c74a1d 100755
--- a/test/list-providers
+++ b/test/list-providers
@@ -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 ["Ignore"]:
+ val += extract_list(values[key])
+ else:
+ val += str(values[key])
val += " }"
return val
@@ -38,7 +41,8 @@ for path in properties["Providers"]:
for key in properties.keys():
if key in ["IPv4", "IPv4.Configuration",
"IPv6", "IPv6.Configuration",
- "Proxy", "Ethernet", "Provider"]:
+ "Proxy", "Proxy.Configuration",
+ "Ethernet", "Provider"]:
val = extract_values(properties[key])
elif key in ["Nameservers", "Nameservers.Configuration",
"Domains", "Domains.Configuration"]:
diff --git a/test/list-services b/test/list-services
index a894092..bf225de 100755
--- a/test/list-services
+++ b/test/list-services
@@ -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 ["Ignore"]:
+ val += extract_list(values[key])
+ else:
+ val += str(values[key])
val += " }"
return val
@@ -38,7 +41,8 @@ for path in properties["Services"]:
for key in properties.keys():
if key in ["IPv4", "IPv4.Configuration",
"IPv6", "IPv6.Configuration",
- "Proxy", "Ethernet", "Provider"]:
+ "Proxy", "Proxy.Configuration",
+ "Ethernet", "Provider"]:
val = extract_values(properties[key])
elif key in ["Nameservers", "Nameservers.Configuration",
"Domains", "Domains.Configuration"]:
diff --git a/test/monitor-services b/test/monitor-services
index 05d1e1d..ead9d36 100755
--- a/test/monitor-services
+++ b/test/monitor-services
@@ -9,7 +9,10 @@ def extract_values(values):
val = "{"
for key in values.keys():
val += " " + key + "="
- val += str(values[key])
+ if key in ["Ignore"]:
+ val += extract_list(values[key])
+ else:
+ val += str(values[key])
val += " }"
return val
@@ -29,8 +32,9 @@ def property_changed(name, value, path):
val = val + " " + i[i.rfind("/") + 1:]
val = val + " ]"
elif name in ["IPv4", "IPv4.Configuration",
- "IPv6", "IPv6.Configuration",
- "Proxy", "Ethernet"]:
+ "IPv6", "IPv6.Configuration",
+ "Proxy", "Proxy.Configuration",
+ "Ethernet"]:
val = extract_values(value)
elif name in ["Nameservers", "Nameservers.Configuration",
"Domains", "Domains.Configuration"]:
diff --git a/test/test-manager b/test/test-manager
index b5a2530..da23e8d 100755
--- 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 ["Ignore"]:
+ val += extract_list(values[key])
+ else:
+ val += str(values[key])
val += " }"
return val
@@ -64,7 +67,8 @@ def print_properties(key, value):
elif key in ["IPv4", "IPv4.Configuration",
"IPv6", "IPv6.Configuration",
- "Proxy", "Ethernet",
"Provider"]:
+ "Proxy", "Proxy.Configuration",
+ "Ethernet", "Provider"]:
val = extract_values(properties[key])
elif key in ["Nameservers", "Nameservers.Configuration",
--
1.7.0.4
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
