Merge pull request #24 from howbazaar/tags

Expose tags for interfaces and machines.

interface.go

@@ -17,6 +17,7 @@ type interface_ struct {
 	name    string
 	type_   string
 	enabled bool
+	tags    []string
 
 	vlan  *vlan
 	links []*link
@@ -59,6 +60,11 @@ func (i *interface_) Enabled() bool {
 	return i.enabled
 }
 
+// Tags implements Interface.
+func (i *interface_) Tags() []string {
+	return i.tags
+}
+
 // VLAN implements Interface.
 func (i *interface_) VLAN() VLAN {
 	return i.vlan
@@ -161,6 +167,7 @@ func interface_2_0(source map[string]interface{}) (*interface_, error) {
 		"name":    schema.String(),
 		"type":    schema.String(),
 		"enabled": schema.Bool(),
+		"tags":    schema.List(schema.String()),
 
 		"vlan":  schema.StringMap(schema.Any()),
 		"links": schema.List(schema.StringMap(schema.Any())),
@@ -197,6 +204,7 @@ func interface_2_0(source map[string]interface{}) (*interface_, error) {
 		name:    valid["name"].(string),
 		type_:   valid["type"].(string),
 		enabled: valid["enabled"].(bool),
+		tags:    convertToStringSlice(valid["tags"]),
 
 		vlan:  vlan,
 		links: links,

interface_test.go

@@ -35,6 +35,7 @@ func (s *interfaceSuite) checkInterface(c *gc.C, iface *interface_) {
 	c.Check(iface.Name(), gc.Equals, "eth0")
 	c.Check(iface.Type(), gc.Equals, "physical")
 	c.Check(iface.Enabled(), jc.IsTrue)
+	c.Check(iface.Tags(), jc.DeepEquals, []string{"foo", "bar"})
 
 	c.Check(iface.MACAddress(), gc.Equals, "52:54:00:c9:6a:45")
 	c.Check(iface.EffectiveMTU(), gc.Equals, 1500)
@@ -109,7 +110,7 @@ const (
     "id": 40,
     "type": "physical",
     "resource_uri": "/MAAS/api/2.0/nodes/4y3ha6/interfaces/40/",
-    "tags": [],
+    "tags": ["foo", "bar"],
     "links": [
         {
             "id": 69,

interfaces.go

@@ -169,6 +169,7 @@ type Machine interface {
 	SystemID() string
 	Hostname() string
 	FQDN() string
+	Tags() []string
 
 	OperatingSystem() string
 	DistroSeries() string
@@ -232,6 +233,7 @@ type Interface interface {
 	Children() []string
 	Type() string
 	Enabled() bool
+	Tags() []string
 
 	VLAN() VLAN
 	Links() []Link
@@ -241,7 +243,6 @@ type Interface interface {
 	Params() string
 
 	// Need to work out types for children, discovered, parents
-	// Tags?
 }
 
 // Link represents a network link between an Interface and a Subnet.

machine.go

@@ -20,6 +20,7 @@ type machine struct {
 	systemID string
 	hostname string
 	fqdn     string
+	tags     []string
 
 	operatingSystem string
 	distroSeries    string
@@ -71,6 +72,11 @@ func (m *machine) FQDN() string {
 	return m.fqdn
 }
 
+// Tags implements Machine.
+func (m *machine) Tags() []string {
+	return m.tags
+}
+
 // IPAddresses implements Machine.
 func (m *machine) IPAddresses() []string {
 	return m.ipAddresses
@@ -250,6 +256,7 @@ func machine_2_0(source map[string]interface{}) (*machine, error) {
 		"system_id": schema.String(),
 		"hostname":  schema.String(),
 		"fqdn":      schema.String(),
+		"tag_names": schema.List(schema.String()),
 
 		"osystem":       schema.String(),
 		"distro_series": schema.String(),
@@ -295,6 +302,7 @@ func machine_2_0(source map[string]interface{}) (*machine, error) {
 		systemID: valid["system_id"].(string),
 		hostname: valid["hostname"].(string),
 		fqdn:     valid["fqdn"].(string),
+		tags:     convertToStringSlice(valid["tag_names"]),
 
 		operatingSystem: valid["osystem"].(string),
 		distroSeries:    valid["distro_series"].(string),

machine_test.go

@@ -43,6 +43,8 @@ func (*machineSuite) TestReadMachines(c *gc.C) {
 	c.Check(machine.SystemID(), gc.Equals, "4y3ha3")
 	c.Check(machine.Hostname(), gc.Equals, "untasted-markita")
 	c.Check(machine.FQDN(), gc.Equals, "untasted-markita.maas")
+	c.Check(machine.Tags(), jc.DeepEquals, []string{"virtual", "magic"})
+
 	c.Check(machine.IPAddresses(), jc.DeepEquals, []string{"192.168.100.4"})
 	c.Check(machine.Memory(), gc.Equals, 1024)
 	c.Check(machine.CPUCount(), gc.Equals, 1)
@@ -337,7 +339,7 @@ const (
         "power_type": "virsh",
         "distro_series": "trusty",
         "tag_names": [
-            "virtual"
+            "virtual", "magic"
         ],
         "disable_ipv4": false,
         "status_message": "From 'Deploying' to 'Deployed'",