Merge pull request #81 from wallyworld/allow-devices-without-pools

#81

Based on #80 by @stgraber

Allow device responses which do not specify a pool.

device.go

@@ -261,7 +261,7 @@ func device_2_0(source map[string]interface{}) (*device, error) {
 		"ip_addresses":  schema.List(schema.String()),
 		"interface_set": schema.List(schema.StringMap(schema.Any())),
 		"zone":          schema.StringMap(schema.Any()),
-		"pool":          schema.StringMap(schema.Any()),
+		"pool":          schema.OneOf(schema.Nil(""), schema.StringMap(schema.Any())),
 	}
 	defaults := schema.Defaults{
 		"owner":  "",
@@ -286,11 +286,13 @@ func device_2_0(source map[string]interface{}) (*device, error) {
 		return nil, errors.Trace(err)
 	}
 
-	pool, err := pool_2_0(valid["pool"].(map[string]interface{}))
-
-	if err != nil {
-		return nil, errors.Trace(err)
+	var pool *pool
+	if valid["pool"] != nil {
+		if pool, err = pool_2_0(valid["pool"].(map[string]interface{})); err != nil {
+			return nil, errors.Trace(err)
+		}
 	}
+
 	owner, _ := valid["owner"].(string)
 	parent, _ := valid["parent"].(string)
 	result := &device{

device_test.go

@@ -43,20 +43,25 @@ func (*deviceSuite) TestReadDevices(c *gc.C) {
 	zone := device.Zone()
 	c.Check(zone, gc.NotNil)
 	c.Check(zone.Name(), gc.Equals, "default")
+	pool := device.Pool()
+	c.Check(pool, gc.NotNil)
+	c.Check(pool.Name(), gc.Equals, "default")
 }
 
 func (*deviceSuite) TestReadDevicesNils(c *gc.C) {
 	json := parseJSON(c, devicesResponse)
 	deviceMap := json.([]interface{})[0].(map[string]interface{})
 	deviceMap["owner"] = nil
 	deviceMap["parent"] = nil
+	deviceMap["pool"] = nil
 	devices, err := readDevices(twoDotOh, json)
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(devices, gc.HasLen, 1)
 
 	device := devices[0]
 	c.Check(device.Owner(), gc.Equals, "")
 	c.Check(device.Parent(), gc.Equals, "")
+	c.Check(device.Pool(), gc.IsNil)
 }
 
 func (*deviceSuite) TestLowVersion(c *gc.C) {
@@ -234,7 +239,7 @@ const (
             "resource_uri": "/MAAS/api/2.0/zones/default/",
             "name": "default"
         },
-		"pool": {
+        "pool": {
             "description": "",
             "resource_uri": "/MAAS/api/2.0/pools/default/",
             "name": "default"

testservice_test.go

@@ -2039,7 +2039,6 @@ func (suite *TestMAASObjectSuite) TestAcquireFilterTag(c *C) {
 	c.Assert(err, IsNil)
 	acquiredNode, err := jsonResponse.GetMAASObject()
 	c.Assert(err, IsNil)
-	fmt.Printf("%v\n", acquiredNode)
 	tag, _ := acquiredNode.GetField("tag_names")
 	c.Assert(tag, Equals, "GPU")
 }