state: add status to allwatcher unit and machine

state/api/params/params.go

 package params
 
 import (
         "bytes"
         "encoding/json"
         "fmt"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/constraints"
 )
 
@@ skipping 295 matching lines @@
 type EntityId struct {
         Kind string
         Id   interface{}
 }
 
 // MachineInfo holds the information about a Machine
 // that is watched by StateWatcher.
 type MachineInfo struct {
         Id         string `bson:"_id"`
         InstanceId string
+        Status     MachineStatus
+        StatusInfo string
 }
 
 func (i *MachineInfo) EntityId() EntityId {
         return EntityId{
                 Kind: "machine",
                 Id:   i.Id,
         }
 }
 
 type ServiceInfo struct {
@@ skipping 12 matching lines @@
 type UnitInfo struct {
         Name           string `bson:"_id"`
         Service        string
         Series         string
         CharmURL       string
         PublicAddress  string
         PrivateAddress string
         MachineId      string
         Resolved       ResolvedMode
         Ports          []Port
+        Status         UnitStatus
+        StatusInfo     string
 }
 
 func (i *UnitInfo) EntityId() EntityId {
         return EntityId{
                 Kind: "unit",
                 Id:   i.Name,
         }
 }
 
 type Endpoint struct {
@@ skipping 17 matching lines @@
         Tag         string
         Annotations map[string]string
 }
 
 func (i *AnnotationInfo) EntityId() EntityId {
         return EntityId{
                 Kind: "annotation",
                 Id:   i.Tag,
         }
 }