--- test/get-services | 8 ++++++-- test/list-providers | 9 +++++++-- test/list-services | 6 +++++- test/monitor-services | 6 +++++- test/test-manager | 9 +++++++-- 5 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/test/get-services b/test/get-services index d337e0c..0b66106 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 @@ -34,7 +37,8 @@ for entry in services: if key in ["IPv4", "IPv4.Configuration", "IPv6", "IPv6.Configuration", "Proxy", "Ethernet", - "Provider"]: + "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..56c74b5 100755 --- a/test/list-providers +++ b/test/list-providers @@ -9,7 +9,11 @@ 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 +42,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 88eea69..aaa87fa 100755 --- a/test/list-services +++ b/test/list-services @@ -9,7 +9,11 @@ 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 diff --git a/test/monitor-services b/test/monitor-services index ceeba79..aba6998 100755 --- a/test/monitor-services +++ b/test/monitor-services @@ -9,7 +9,11 @@ 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 diff --git a/test/test-manager b/test/test-manager index b5a2530..2a19810 100755 --- a/test/test-manager +++ b/test/test-manager @@ -9,7 +9,11 @@ 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 +68,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.1 _______________________________________________ connman mailing list connman@connman.net http://lists.connman.net/listinfo/connman