state: add nonced provisioning support

state/megawatcher_internal_test.go

 package state
 
 import (
         "errors"
         "fmt"
         "labix.org/v2/mgo"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/state/api/params"
         "launchpad.net/juju-core/state/multiwatcher"
@@ skipping 42 matching lines @@
 // setUpScenario adds some entities to the state so that
 // we can check that they all get pulled in by
 // allWatcherStateBacking.getAll.
 func (s *storeManagerStateSuite) setUpScenario(c *C) (entities entityInfoSlice) {
         add := func(e params.EntityInfo) {
                 entities = append(entities, e)
         }
         m, err := s.State.AddMachine("series", JobManageEnviron)
         c.Assert(err, IsNil)
         c.Assert(m.Tag(), Equals, "machine-0")
-        err = m.SetInstanceId(InstanceId("i-" + m.Tag()))
+        err = m.SetProvisioned(InstanceId("i-"+m.Tag()), "fake_nonce")
         c.Assert(err, IsNil)
         add(&params.MachineInfo{
                 Id:         "0",
                 InstanceId: "i-machine-0",
                 Status:     params.MachinePending,
         })
 
         wordpress, err := s.State.AddService("wordpress", AddTestingCharm(c, s.State, "wordpress"))
         c.Assert(err, IsNil)
         err = wordpress.SetExposed()
@@ skipping 47 matching lines @@
                         Status:    params.UnitPending,
                 })
                 pairs := map[string]string{"name": fmt.Sprintf("bar %d", i)}
                 err = wu.SetAnnotations(pairs)
                 c.Assert(err, IsNil)
                 add(&params.AnnotationInfo{
                         Tag:         fmt.Sprintf("unit-wordpress-%d", i),
                         Annotations: pairs,
                 })
 
-                err = m.SetInstanceId(InstanceId("i-" + m.Tag()))
+                err = m.SetProvisioned(InstanceId("i-"+m.Tag()), "fake_nonce")
                 c.Assert(err, IsNil)
                 err = m.SetStatus(params.MachineError, m.Tag())
                 c.Assert(err, IsNil)
                 add(&params.MachineInfo{
                         Id:         fmt.Sprint(i + 1),
                         InstanceId: "i-" + m.Tag(),
                         Status:     params.MachineError,
                         StatusInfo: m.Tag(),
                 })
                 err = wu.AssignToMachine(m)
@@ skipping 114 matching lines @@
                 add: []params.EntityInfo{
                         &params.MachineInfo{
                                 Id:         "0",
                                 Status:     params.MachineError,
                                 StatusInfo: "another failure",
                         },
                 },
                 setUp: func(c *C, st *State) {
                         m, err := st.AddMachine("series", JobManageEnviron)
                         c.Assert(err, IsNil)
-                        err = m.SetInstanceId("i-0")
+                        err = m.SetProvisioned("i-0", "bootstrap_nonce")
                         c.Assert(err, IsNil)
                 },
                 change: watcher.Change{
                         C:  "machines",
                         Id: "0",
                 },
                 expectContents: []params.EntityInfo{
                         &params.MachineInfo{
                                 Id:         "0",
                                 InstanceId: "i-0",
@@ skipping 411 matching lines @@
                         Status: params.MachinePending,
                 },
         }, {
                 Entity: &params.MachineInfo{
                         Id:     "1",
                         Status: params.MachinePending,
                 },
         }}, "")
 
         // Make some changes to the state.
-        err = m0.SetInstanceId("i-0")
+        err = m0.SetProvisioned("i-0", "bootstrap_nonce")
         c.Assert(err, IsNil)
         err = m1.Destroy()
         c.Assert(err, IsNil)
         err = m1.EnsureDead()
         c.Assert(err, IsNil)
         err = m1.Remove()
         c.Assert(err, IsNil)
         m2, err := s.State.AddMachine("series", JobManageEnviron)
         c.Assert(err, IsNil)
         c.Assert(m2.Id(), Equals, "2")
@@ skipping 94 matching lines @@
                         panic(fmt.Errorf("%v mentioned twice in delta set", id))
                 }
                 if d.Removed {
                         m[id] = nil
                 } else {
                         m[id] = d.Entity
                 }
         }
         return m
 }