Merge lp:~axwalk/juju-core/lp1222664-maas-instance-stringer into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

provider/maas: add String method to maasInstance

https://codereview.appspot.com/13620043/

provider/maas: add String method to maasInstance

https://codereview.appspot.com/13620043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+184505_code.launchpad.net,

Message:
Please take a look.

Description:
provider/maas: add String method to maasInstance

https://code.launchpad.net/~axwalk/juju-core/lp1222664-maas-instance-stringer/+merge/184505

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/13620043/

Affected files (+15, -0 lines):
   A [revision details]
   M provider/maas/instance.go
   M provider/maas/instance_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20130908094110-qc1z761lrq29tdua
+New revision: <email address hidden>

Index: provider/maas/instance.go
=== modified file 'provider/maas/instance.go'
--- provider/maas/instance.go 2013-09-04 15:11:51 +0000
+++ provider/maas/instance.go 2013-09-09 06:35:14 +0000
@@ -17,6 +17,10 @@

  var _ instance.Instance = (*maasInstance)(nil)

+func (mi *maasInstance) String() string {
+ return string(mi.Id())
+}
+
  func (mi *maasInstance) Id() instance.Id {
   // Use the node's 'resource_uri' value.
   return instance.Id(mi.maasObject.URI().String())

Index: provider/maas/instance_test.go
=== modified file 'provider/maas/instance_test.go'
--- provider/maas/instance_test.go 2013-09-04 15:11:51 +0000
+++ provider/maas/instance_test.go 2013-09-09 06:35:14 +0000
@@ -4,6 +4,8 @@
  package maas

  import (
+ "fmt"
+
   gc "launchpad.net/gocheck"

   "launchpad.net/juju-core/instance"
@@ -25,6 +27,13 @@
   c.Check(string(instance.Id()), gc.Equals, resourceURI)
  }

+func (s *instanceTest) TestString(c *gc.C) {
+ jsonValue := `{"system_id": "system_id", "test": "test"}`
+ obj := s.testMAASObject.TestServer.NewNode(jsonValue)
+ instance := &maasInstance{&obj, s.environ}
+ c.Assert(fmt.Sprint(instance), gc.Equals, string(instance.Id()))
+}
+
  func (s *instanceTest) TestRefreshInstance(c *gc.C) {
   jsonValue := `{"system_id": "system_id", "test": "test"}`
   obj := s.testMAASObject.TestServer.NewNode(jsonValue)

[Julian Edwards (julian-edwards)]

Printing hostname as well as ID would make life easier for humans.

review: Approve

[Andrew Wilkins (axwalk)]

Please take a look.

https://codereview.appspot.com/13620043/

=== modified file 'provider/maas/instance.go'
--- provider/maas/instance.go	2013-09-04 15:11:51 +0000
+++ provider/maas/instance.go	2013-09-09 07:06:26 +0000
@@ -4,6 +4,8 @@
 package maas
 
 import (
+	"fmt"
+
 	"launchpad.net/gomaasapi"
 
 	"launchpad.net/juju-core/instance"
@@ -17,6 +19,15 @@
 
 var _ instance.Instance = (*maasInstance)(nil)
 
+func (mi *maasInstance) String() string {
+	hostname, err := mi.DNSName()
+	if err != nil {
+		// This is meant to be impossible, but be paranoid.
+		hostname = fmt.Sprintf("<DNSName failed: %q>", err)
+	}
+	return fmt.Sprintf("%s:%s", hostname, mi.Id())
+}
+
 func (mi *maasInstance) Id() instance.Id {
 	// Use the node's 'resource_uri' value.
 	return instance.Id(mi.maasObject.URI().String())

=== modified file 'provider/maas/instance_test.go'
--- provider/maas/instance_test.go	2013-09-04 15:11:51 +0000
+++ provider/maas/instance_test.go	2013-09-09 07:06:26 +0000
@@ -4,6 +4,8 @@
 package maas
 
 import (
+	"fmt"
+
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/instance"
@@ -25,6 +27,25 @@
 	c.Check(string(instance.Id()), gc.Equals, resourceURI)
 }
 
+func (s *instanceTest) TestString(c *gc.C) {
+	jsonValue := `{"hostname": "thethingintheplace", "system_id": "system_id", "test": "test"}`
+	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
+	instance := &maasInstance{&obj, s.environ}
+	hostname, err := instance.DNSName()
+	c.Assert(err, gc.IsNil)
+	expected := hostname + ":" + string(instance.Id())
+	c.Assert(fmt.Sprint(instance), gc.Equals, expected)
+
+	// For good measure, test what happens if we don't have a hostname.
+	jsonValue = `{"system_id": "system_id", "test": "test"}`
+	obj = s.testMAASObject.TestServer.NewNode(jsonValue)
+	instance = &maasInstance{&obj, s.environ}
+	hostname, err = instance.DNSName()
+	c.Assert(err, gc.NotNil)
+	expected = fmt.Sprintf("<DNSName failed: %q>", err) + ":" + string(instance.Id())
+	c.Assert(fmt.Sprint(instance), gc.Equals, expected)
+}
+
 func (s *instanceTest) TestRefreshInstance(c *gc.C) {
 	jsonValue := `{"system_id": "system_id", "test": "test"}`
 	obj := s.testMAASObject.TestServer.NewNode(jsonValue)