Pretty printers for proxy settings in various test tool.

diff --git a/test/get-services b/test/get-services
index d337e0c..3fec394 100755 (executable)
--- 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 ["Servers", "Excludes"]:
+                       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", "Proxy.Configuration",
+                                               "Ethernet", "Provider"]:
                        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..8497685 100755 (executable)
--- 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 ["Servers", "Excludes"]:
+                               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 88eea69..c4ae5d7 100755 (executable)
--- 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 ["Servers", "Excludes"]:
+                               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..b7c95de 100755 (executable)
--- 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 ["Servers", "Excludes"]:
+                       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..2a967f5 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
 
@@ -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",