Implement pools

controller.go

@@ -222,6 +222,26 @@ func (c *controller) Zones() ([]Zone, error) {
 	return result, nil
 }
 
+// Pools implements Controller.
+func (c *controller) Pools() ([]Pool, error) {
+	var result []Pool
+
+	source, err := c.get("pools")
+	if err != nil {
+		return nil, NewUnexpectedError(err)
+	}
+
+	pools, err := readPools(c.apiVersion, source)
+	if err != nil {
+		return nil, errors.Trace(err)
+	}
+
+	for _, p := range pools {
+		result = append(result, p)
+	}
+	return result, nil
+}
+
 // Domains implements Controller
 func (c *controller) Domains() ([]Domain, error) {
 	source, err := c.get("domains")
@@ -247,6 +267,7 @@ type DevicesArgs struct {
 	SystemIDs    []string
 	Domain       string
 	Zone         string
+	Pool         string
 	AgentName    string
 }
 
@@ -258,6 +279,7 @@ func (c *controller) Devices(args DevicesArgs) ([]Device, error) {
 	params.MaybeAddMany("id", args.SystemIDs)
 	params.MaybeAdd("domain", args.Domain)
 	params.MaybeAdd("zone", args.Zone)
+	params.MaybeAdd("pool", args.Pool)
 	params.MaybeAdd("agent_name", args.AgentName)
 	source, err := c.getQuery("devices", params.Values)
 	if err != nil {
@@ -321,6 +343,7 @@ type MachinesArgs struct {
 	SystemIDs    []string
 	Domain       string
 	Zone         string
+	Pool         string
 	AgentName    string
 	OwnerData    map[string]string
 }
@@ -333,6 +356,7 @@ func (c *controller) Machines(args MachinesArgs) ([]Machine, error) {
 	params.MaybeAddMany("id", args.SystemIDs)
 	params.MaybeAdd("domain", args.Domain)
 	params.MaybeAdd("zone", args.Zone)
+	params.MaybeAdd("pool", args.Pool)
 	params.MaybeAdd("agent_name", args.AgentName)
 	// At the moment the MAAS API doesn't support filtering by owner
 	// data so we do that ourselves below.
@@ -371,7 +395,7 @@ type StorageSpec struct {
 	Label string
 	// Size is required and refers to the required minimum size in GB.
 	Size int
-	// Zero or more tags assocated to with the disks.
+	// Zero or more tags associated to the disks.
 	Tags []string
 }
 
@@ -402,7 +426,7 @@ func (s *StorageSpec) String() string {
 	return fmt.Sprintf("%s%d%s", label, s.Size, tags)
 }
 
-// InterfaceSpec represents one elemenet of network related constraints.
+// InterfaceSpec represents one element of network related constraints.
 type InterfaceSpec struct {
 	// Label is required and an arbitrary string. Labels need to be unique
 	// across the InterfaceSpec elements specified in the AllocateMachineArgs.
@@ -451,7 +475,9 @@ type AllocateMachineArgs struct {
 	Tags      []string
 	NotTags   []string
 	Zone      string
+	Pool      string
 	NotInZone []string
+	NotInPool []string
 	// Storage represents the required disks on the Machine. If any are specified
 	// the first value is used for the root disk.
 	Storage []StorageSpec
@@ -466,8 +492,9 @@ type AllocateMachineArgs struct {
 	DryRun    bool
 }
 
-// Validate makes sure that any labels specifed in Storage or Interfaces
-// are unique, and that the required specifications are valid.
+// Validate makes sure that any labels specified in Storage or Interfaces
+// are unique, and that the required specifications are valid. It
+// also makes sure that any pools specified exist.
 func (a *AllocateMachineArgs) Validate() error {
 	storageLabels := set.NewStrings()
 	for _, spec := range a.Storage {
@@ -554,7 +581,9 @@ func (c *controller) AllocateMachine(args AllocateMachineArgs) (Machine, Constra
 	params.MaybeAdd("interfaces", args.interfaces())
 	params.MaybeAddMany("not_subnets", args.notSubnets())
 	params.MaybeAdd("zone", args.Zone)
+	params.MaybeAdd("pool", args.Pool)
 	params.MaybeAddMany("not_in_zone", args.NotInZone)
+	params.MaybeAddMany("not_in_pool", args.NotInPool)
 	params.MaybeAdd("agent_name", args.AgentName)
 	params.MaybeAdd("comment", args.Comment)
 	params.MaybeAddBool("dry_run", args.DryRun)

controller_test.go

@@ -53,6 +53,7 @@ func (s *controllerSuite) SetUpTest(c *gc.C) {
 	server.AddGetResponse("/api/2.0/users/?op=whoami", http.StatusOK, `"captain awesome"`)
 	server.AddGetResponse("/api/2.0/version/", http.StatusOK, versionResponse)
 	server.AddGetResponse("/api/2.0/zones/", http.StatusOK, zoneResponse)
+	server.AddGetResponse("/api/2.0/pools/", http.StatusOK, poolResponse)
 	server.Start()
 	s.AddCleanup(func(*gc.C) { server.Close() })
 	s.server = server
@@ -343,6 +344,13 @@ func (s *controllerSuite) TestZones(c *gc.C) {
 	c.Assert(zones, gc.HasLen, 2)
 }
 
+func (s *controllerSuite) TestPools(c *gc.C) {
+	controller := s.getController(c)
+	pools, err := controller.Pools()
+	c.Assert(err, jc.ErrorIsNil)
+	c.Assert(pools, gc.HasLen, 2)
+}
+
 func (s *controllerSuite) TestMachines(c *gc.C) {
 	controller := s.getController(c)
 	machines, err := controller.Machines(MachinesArgs{})
@@ -409,11 +417,12 @@ func (s *controllerSuite) TestMachinesArgs(c *gc.C) {
 		SystemIDs:    []string{"something-else"},
 		Domain:       "magic",
 		Zone:         "foo",
+		Pool:         "swimming_is_fun",
 		AgentName:    "agent 42",
 	})
 	request := s.server.LastRequest()
 	// There should be one entry in the form values for each of the args.
-	c.Assert(request.URL.Query(), gc.HasLen, 6)
+	c.Assert(request.URL.Query(), gc.HasLen, 7)
 }
 
 func (s *controllerSuite) TestStorageSpec(c *gc.C) {
@@ -696,6 +705,7 @@ func (s *controllerSuite) TestAllocateMachineArgsForm(c *gc.C) {
 		Interfaces:   []InterfaceSpec{{Label: "default", Space: "magic"}},
 		NotSpace:     []string{"special"},
 		Zone:         "magic",
+		Pool:         "swimming_is_fun",
 		NotInZone:    []string{"not-magic"},
 		AgentName:    "agent 42",
 		Comment:      "testing",
@@ -707,7 +717,7 @@ func (s *controllerSuite) TestAllocateMachineArgsForm(c *gc.C) {
 	request := s.server.LastRequest()
 	// There should be one entry in the form values for each of the args.
 	form := request.PostForm
-	c.Assert(form, gc.HasLen, 15)
+	c.Assert(form, gc.HasLen, 16)
 	// Positive space check.
 	c.Assert(form.Get("interfaces"), gc.Equals, "default:space=magic")
 	// Negative space check.

device.go

@@ -28,6 +28,7 @@ type device struct {
 	ipAddresses  []string
 	interfaceSet []*interface_
 	zone         *zone
+	pool         *pool
 }
 
 // SystemID implements Device.
@@ -68,6 +69,14 @@ func (d *device) Zone() Zone {
 	return d.zone
 }
 
+// Pool implements Device.
+func (d *device) Pool() Pool {
+	if d.pool == nil {
+		return nil
+	}
+	return d.pool
+}
+
 // InterfaceSet implements Device.
 func (d *device) InterfaceSet() []Interface {
 	result := make([]Interface, len(d.interfaceSet))
@@ -252,6 +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()),
 	}
 	defaults := schema.Defaults{
 		"owner":  "",
@@ -270,7 +280,14 @@ func device_2_0(source map[string]interface{}) (*device, error) {
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
+
 	zone, err := zone_2_0(valid["zone"].(map[string]interface{}))
+	if err != nil {
+		return nil, errors.Trace(err)
+	}
+
+	pool, err := pool_2_0(valid["pool"].(map[string]interface{}))
+
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
@@ -288,6 +305,7 @@ func device_2_0(source map[string]interface{}) (*device, error) {
 		ipAddresses:  convertToStringSlice(valid["ip_addresses"]),
 		interfaceSet: interfaceSet,
 		zone:         zone,
+		pool:         pool,
 	}
 	return result, nil
 }

device_test.go

@@ -233,6 +233,11 @@ const (
             "description": "",
             "resource_uri": "/MAAS/api/2.0/zones/default/",
             "name": "default"
+        },
+		"pool": {
+            "description": "",
+            "resource_uri": "/MAAS/api/2.0/pools/default/",
+            "name": "default"
         },
         "domain": {
             "resource_record_count": 0,

interface.go

@@ -12,7 +12,7 @@ import (
 	"github.com/juju/version"
 )
 
-// Can't use interface as a type, so add an underscore. Yay.
+// Can't use "interface" as a type, so add an underscore. Yay.
 type interface_ struct {
 	controller *controller
 

interface_test.go

@@ -471,7 +471,7 @@ const (
     "parents": ["bond0"],
     "id": 40,
     "type": "physical",
-    "resource_uri": "/MAAS/api/2.0/nodes/4y3ha6/interfaces/40/",
+    "resource_uri": "/maas/api/2.0/nodes/4y3ha6/interfaces/40/",
     "tags": null,
     "links": [
         {

interfaces.go

@@ -38,6 +38,9 @@ type Controller interface {
 	// Zones lists all the zones known to the MAAS controller.
 	Zones() ([]Zone, error)
 
+	// Pools lists all the pools known to the MAAS controller.
+	Pools() ([]Pool, error)
+
 	// Machines returns a list of machines that match the params.
 	Machines(MachinesArgs) ([]Machine, error)
 
@@ -145,6 +148,13 @@ type Zone interface {
 	Description() string
 }
 
+// Pool is just a logical separation of resources.
+type Pool interface {
+	// The name of the resource pool
+	Name() string
+	Description() string
+}
+
 type Domain interface {
 	// The name of the Domain
 	Name() string
@@ -168,6 +178,7 @@ type Device interface {
 	FQDN() string
 	IPAddresses() []string
 	Zone() Zone
+	Pool() Pool
 
 	// Parent returns the SystemID of the Parent. Most often this will be a
 	// Machine.
@@ -240,6 +251,7 @@ type Machine interface {
 	Partition(id int) Partition
 
 	Zone() Zone
+	Pool() Pool
 
 	// Start the machine and install the operating system specified in the args.
 	Start(StartArgs) error

machine.go

@@ -40,6 +40,7 @@ type machine struct {
 	bootInterface *interface_
 	interfaceSet  []*interface_
 	zone          *zone
+	pool          *pool
 	// Don't really know the difference between these two lists:
 	physicalBlockDevices []*blockdevice
 	blockDevices         []*blockdevice
@@ -60,6 +61,7 @@ func (m *machine) updateFrom(other *machine) {
 	m.statusName = other.statusName
 	m.statusMessage = other.statusMessage
 	m.zone = other.zone
+	m.pool = other.pool
 	m.tags = other.tags
 	m.ownerData = other.ownerData
 }
@@ -84,6 +86,14 @@ func (m *machine) Tags() []string {
 	return m.tags
 }
 
+// Pool implements Machine
+func (m *machine) Pool() Pool {
+	if m.pool == nil {
+		return nil
+	}
+	return m.pool
+}
+
 // IPAddresses implements Machine.
 func (m *machine) IPAddresses() []string {
 	return m.ipAddresses
@@ -510,13 +520,15 @@ func machine_2_0(source map[string]interface{}) (*machine, error) {
 		"boot_interface": schema.OneOf(schema.Nil(""), schema.StringMap(schema.Any())),
 		"interface_set":  schema.List(schema.StringMap(schema.Any())),
 		"zone":           schema.StringMap(schema.Any()),
+		"pool":           schema.StringMap(schema.Any()),
 
 		"physicalblockdevice_set": schema.List(schema.StringMap(schema.Any())),
 		"blockdevice_set":         schema.List(schema.StringMap(schema.Any())),
 	}
 	defaults := schema.Defaults{
 		"architecture": "",
 	}
+
 	checker := schema.FieldMap(fields, defaults)
 	coerced, err := checker.Coerce(source, nil)
 	if err != nil {
@@ -538,14 +550,23 @@ func machine_2_0(source map[string]interface{}) (*machine, error) {
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
+
 	zone, err := zone_2_0(valid["zone"].(map[string]interface{}))
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
+
+	pool, err := pool_2_0(valid["pool"].(map[string]interface{}))
+	if err != nil {
+
+		return nil, errors.Trace(err)
+	}
+
 	physicalBlockDevices, err := readBlockDeviceList(valid["physicalblockdevice_set"].([]interface{}), blockdevice_2_0)
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
+
 	blockDevices, err := readBlockDeviceList(valid["blockdevice_set"].([]interface{}), blockdevice_2_0)
 	if err != nil {
 		return nil, errors.Trace(err)
@@ -575,6 +596,7 @@ func machine_2_0(source map[string]interface{}) (*machine, error) {
 		bootInterface:        bootInterface,
 		interfaceSet:         interfaceSet,
 		zone:                 zone,
+		pool:                 pool,
 		physicalBlockDevices: physicalBlockDevices,
 		blockDevices:         blockDevices,
 	}