Merge lp:~kvalo/indicator-network/connman-mock-settings-support into lp:~indicator-applet-developers/indicator-network/indicator-network

[Kalle Valo]

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'tests/connman-mock/connman-mock'
--- tests/connman-mock/connman-mock	2010-12-09 15:14:32 +0000
+++ tests/connman-mock/connman-mock	2010-12-10 12:24:28 +0000
@@ -84,18 +84,45 @@
             self.properties["LoginRequired"] = False
             self.properties["Favorite"] = False
             self.properties["Immutable"] = False
-            self.properties["Autoconnect"] = False
+            self.properties["AutoConnect"] = False
 
-            # FIXME: add Nameservers and Nameservers.Configuration
-            # FIXME: add Domains and Domains.Configuration
-            # FIXME: add IPv4 and IPv4.Configuration
-            # FIXME: add IPv6 and IPv4.Configuration
-            # FIXME: add Proxy
-            # FIXME: add Provider
-            # FIXME: add Ethernet
+            self.properties["Nameservers"] = [ "127.0.0.1" ]
+            self.properties["Nameservers.Configuration"] = [ "127.0.0.1" ]
+            self.properties["Domains"] = [ "example.com" ]
+            self.properties["Domains.Configuration"] = [ "example.com" ]
+            self.properties["IPv4"] =  {
+                  "Method" : "dhcp",
+                  "Address" : "192.168.1.2",
+                  "Netmask" : "255.255.255.0",
+                  "Gateway" : "192.168.1.1"  }
+            self.properties["IPv4.Configuration"] = { "Method" : "dhcp" }
+            self.properties["IPv6"] = { "Method" : "off" }
+            self.properties["IPv6.Configuration"] = { "Method" : "off" }
+            self.properties["Proxy"] = { "Method" : "direct" }
+            self.properties["Provider"] = dbus.Dictionary(signature='sv')
+            self.properties["Ethernet"] =  {
+                  "Interface" : "wlan0",
+                  "Method" : "auto",
+                  "Address" : "00:11:22:33:44:55" }
 
             dbus.service.Object.__init__(self, bus_name, self.path)
 
+      @dbus.service.method("net.connman.Service", in_signature="sv")
+      def SetProperty(self, prop, value):
+            rw = [ "Passphrase", "AutoConnect", "APN",
+                   "Nameservers.Configuration", "Domains.Configuration",
+                   "IPv4.Configuration", "IPv6.Configuration",
+                   "Proxy.Configuration" ]
+
+            if prop not in rw:
+                  raise dbus.DBusException("Can't change property: " + prop)
+
+            self.set_property(prop, value)
+
+            if prop == "Passphrase" and len(value) > 0 \
+                      and self.properties["PassphraseRequired"] == True:
+                  self.set_property("PassphraseRequired", False)
+
       @dbus.service.method("net.connman.Service", out_signature="a{sv}")
       def GetProperties(self):
             return self.properties