Add machine instance metadata to state

cmd/juju/status_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package main
 
 import (
         "bytes"
         "encoding/json"
         "fmt"
         . "launchpad.net/gocheck"
@@ skipping 818 matching lines @@
         c.Assert(m.Id(), Equals, ac.machineId)
 }
 
 type startMachine struct {
         machineId string
 }
 
 func (sm startMachine) step(c *C, ctx *context) {
         m, err := ctx.st.Machine(sm.machineId)
         c.Assert(err, IsNil)
-        inst, md := testing.StartInstance(c, ctx.conn.Environ, m.Id())
-        err = m.SetProvisioned(inst.Id(), "fake_nonce", md)
+        inst, hc := testing.StartInstance(c, ctx.conn.Environ, m.Id())
+        err = m.SetProvisioned(inst.Id(), "fake_nonce", hc)
         c.Assert(err, IsNil)
 }
 
 type startMissingMachine struct {
         machineId string
 }
 
 func (sm startMissingMachine) step(c *C, ctx *context) {
         m, err := ctx.st.Machine(sm.machineId)
         c.Assert(err, IsNil)
-        _, md := testing.StartInstance(c, ctx.conn.Environ, m.Id())
-        err = m.SetProvisioned("i-missing", "fake_nonce", md)
+        _, hc := testing.StartInstance(c, ctx.conn.Environ, m.Id())
+        err = m.SetProvisioned("i-missing", "fake_nonce", hc)
         c.Assert(err, IsNil)
 }
 
 type startAliveMachine struct {
         machineId string
 }
 
 func (sam startAliveMachine) step(c *C, ctx *context) {
         m, err := ctx.st.Machine(sam.machineId)
         c.Assert(err, IsNil)
         pinger, err := m.SetAgentAlive()
         c.Assert(err, IsNil)
         ctx.st.StartSync()
         err = m.WaitAgentAlive(200 * time.Millisecond)
         c.Assert(err, IsNil)
         agentAlive, err := m.AgentAlive()
         c.Assert(err, IsNil)
         c.Assert(agentAlive, Equals, true)
-        inst, md := testing.StartInstance(c, ctx.conn.Environ, m.Id())
-        err = m.SetProvisioned(inst.Id(), "fake_nonce", md)
+        inst, hc := testing.StartInstance(c, ctx.conn.Environ, m.Id())
+        err = m.SetProvisioned(inst.Id(), "fake_nonce", hc)
         c.Assert(err, IsNil)
         ctx.pingers[m.Id()] = pinger
 }
 
 type setTools struct {
         machineId string
         tools     *state.Tools
 }
 
 func (st setTools) step(c *C, ctx *context) {
@@ skipping 235 matching lines @@
         for i, t := range statusTests {
                 c.Logf("test %d: %s", i, t.summary)
                 func() {
                         // Prepare context and run all steps to setup.
                         ctx := s.newContext()
                         defer s.resetContext(c, ctx)
                         ctx.run(c, t.steps)
                 }()
         }
 }