Merge lp:~chipaca/ubuntu-push/new-nm-api into lp:ubuntu-push

[John Lenton]

Switched networkmanager to use the non-deprecated api for
state.

Switched networkmanager to use the non-deprecated api for
state. Needed adding GetProperty for that...

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'bus/endpoint.go'
--- bus/endpoint.go	2014-01-20 13:45:30 +0000
+++ bus/endpoint.go	2014-01-20 18:16:27 +0000
@@ -19,6 +19,7 @@
 // Here we define the Endpoint, which represents the DBus connection itself.
 
 import (
+	"errors"
 	"launchpad.net/go-dbus/v1"
 	"launchpad.net/ubuntu-push/logger"
 )
@@ -31,6 +32,7 @@
 type Endpoint interface {
 	WatchSignal(member string, f func(interface{}), d func()) error
 	Call(member string, args ...interface{}) (interface{}, error)
+	GetProperty(property string) (interface{}, error)
 	Close()
 }
 
@@ -84,6 +86,27 @@
 	}
 }
 
+// GetProperty uses the org.freedesktop.DBus.Properties interface's Get method
+// to read a given property on the name, path and interface provided when
+// creating the endpoint. The return value is unpacked into a dbus.Variant,
+// and its value returned.
+func (endp endpoint) GetProperty(property string) (interface{}, error) {
+	proxy := endp.bus.Object(endp.name, dbus.ObjectPath(endp.path))
+	msg, err := proxy.Call("org.freedesktop.DBus.Properties", "Get", endp.iface, property)
+	if err != nil {
+		return nil, err
+	}
+	variantv, err := endp.unpackOneMsg(msg, property)
+	if err != nil {
+		return nil, err
+	}
+	variant, ok := variantv.(*dbus.Variant)
+	if !ok {
+		return nil, errors.New("Response from Properties.Get wasn't a *dbus.Variant")
+	}
+	return variant.Value, nil
+}
+
 // Close the connection to dbus.
 func (endp endpoint) Close() {
 	endp.bus.Close()

=== modified file 'bus/testing/testing_endpoint.go'
--- bus/testing/testing_endpoint.go	2014-01-20 13:45:30 +0000
+++ bus/testing/testing_endpoint.go	2014-01-20 18:16:27 +0000
@@ -69,6 +69,11 @@
 	}
 }
 
+// See Endpoint's GetProperty. This one is just another name for Call.
+func (tc *testingEndpoint) GetProperty(property string) (interface{}, error) {
+	return tc.Call(property)
+}
+
 // see Endpoint's Close. This one does nothing.
 func (tc *testingEndpoint) Close() {}
 

=== modified file 'bus/testing/testing_endpoint_test.go'
--- bus/testing/testing_endpoint_test.go	2014-01-20 12:36:21 +0000
+++ bus/testing/testing_endpoint_test.go	2014-01-20 18:16:27 +0000
@@ -71,3 +71,12 @@
 	e := endp.WatchSignal("what", func(u interface{}) {}, func() {})
 	c.Check(e, NotNil)
 }
+
+// Tests that GetProperty() works
+func (s *TestingEndpointSuite) TestGetProperty(c *C) {
+	var m uint32 = 42
+	endp := NewTestingEndpoint(condition.Work(true), m)
+	v, e := endp.GetProperty("what")
+	c.Check(e, IsNil)
+	c.Check(v, Equals, m)
+}

=== modified file 'networkmanager/networkmanager.go'
--- networkmanager/networkmanager.go	2014-01-20 18:16:27 +0000
+++ networkmanager/networkmanager.go	2014-01-20 18:16:27 +0000
@@ -61,8 +61,7 @@
 */
 
 func (nm *networkManager) GetState() State {
-	s, err := nm.bus.Call("state")
-
+	s, err := nm.bus.GetProperty("state")
 	if err != nil {
 		nm.log.Errorf("Failed gettting current state: %s", err)
 		nm.log.Debugf("Defaulting state to Unknown")