state: add machine status; refractor unit status

state/megawatcher_internal_test.go

 package state
 
 import (
         "container/list"
         "errors"
         "fmt"
         "labix.org/v2/mgo"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/state/api/params"
@@ skipping 757 matching lines @@
                 m, err := s.State.AddMachine("series", JobHostUnits)
                 c.Assert(err, IsNil)
                 c.Assert(m.Tag(), Equals, fmt.Sprintf("machine-%d", i+1))
 
                 add(&params.UnitInfo{
                         Name:      fmt.Sprintf("wordpress/%d", i),
                         Service:   wordpress.Name(),
                         Series:    m.Series(),
                         MachineId: m.Id(),
                         Ports:     []params.Port{},
-                        Status:    params.UnitPending,
                 })
                 pairs := map[string]string{"name": fmt.Sprintf("bar %d", i)}
                 err = wu.SetAnnotations(pairs)
                 c.Assert(err, IsNil)
                 add(&params.AnnotationInfo{
                         GlobalKey:   fmt.Sprintf("u#wordpress/%d", i),
                         Tag:         fmt.Sprintf("unit-wordpress-%d", i),
                         Annotations: pairs,
                 })
 
@@ skipping 22 matching lines @@
                 c.Assert(err, IsNil)
                 c.Assert(lu.IsPrincipal(), Equals, false)
                 deployer, ok = lu.DeployerTag()
                 c.Assert(ok, Equals, true)
                 c.Assert(deployer, Equals, fmt.Sprintf("unit-wordpress-%d", i))
                 add(&params.UnitInfo{
                         Name:    fmt.Sprintf("logging/%d", i),
                         Service: "logging",
                         Series:  "series",
                         Ports:   []params.Port{},
-                        Status:  params.UnitPending,
                 })
         }
         return
 }
 
 func serviceCharmURL(svc *Service) *charm.URL {
         url, _ := svc.CharmURL()
         return url
 }
 
@@ skipping 538 matching lines @@
         delete(b.entities, id)
         b.txnRevno++
         if b.watchc != nil {
                 b.watchc <- watcher.Change{
                         C:     id.collection,
                         Id:    id.id,
                         Revno: -1,
                 }
         }
 }