various: unify machine and unit status types

various: unify machine and unit status types

Trivial change to simplify the code by unifying
machine and unit status type to params.Status,
rather than two separate types and separate
list of constants.

https://code.launchpad.net/~dimitern/juju-core/031-unify-machine-unit-status-types/+merge/158411

(do not edit description out of merge proposal)

[dimitern, 2013-04-11 16:03:51]

Please take a look.

[fwereade, 2013-04-11 16:16:08]

LGTM, nice

[rog, 2013-04-11 16:44:34]

LGTM with a few trivials below.

https://codereview.appspot.com/8667043/diff/1/cmd/juju/status.go
File cmd/juju/status.go (left):

https://codereview.appspot.com/8667043/diff/1/cmd/juju/status.go#oldcode151
cmd/juju/status.go:151: if status != params.MachinePending {
great!

https://codereview.appspot.com/8667043/diff/1/state/api/params/status.go
File state/api/params/status.go (right):

https://codereview.appspot.com/8667043/diff/1/state/api/params/status.go#newc...
state/api/params/status.go:3: // Status represents the status of the unit,
machine or their agent.
s/the/a/
s/their/its/

or...
how about:
// Status represents the status of an entity.
?

that way we don't need to update all the comments if we
start using it for something else.

https://codereview.appspot.com/8667043/diff/1/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/8667043/diff/1/state/machine.go#newcode507
state/machine.go:507: doc := statusDoc{status, info}
i'd prefer to leave the fields explicit here, please.

https://codereview.appspot.com/8667043/diff/1/state/unit.go
File state/unit.go (right):

https://codereview.appspot.com/8667043/diff/1/state/unit.go#newcode453
state/unit.go:453: doc := statusDoc{status, info}
please leave explicit fields.

[dimitern, 2013-04-11 17:02:40]

*** Submitted:

various: unify machine and unit status types

Trivial change to simplify the code by unifying
machine and unit status type to params.Status,
rather than two separate types and separate
list of constants.

R=fwereade, rog
CC=
https://codereview.appspot.com/8667043

https://codereview.appspot.com/8667043/diff/1/state/api/params/status.go
File state/api/params/status.go (right):

https://codereview.appspot.com/8667043/diff/1/state/api/params/status.go#newc...
state/api/params/status.go:3: // Status represents the status of the unit,
machine or their agent.
On 2013/04/11 16:44:34, rog wrote:
> s/the/a/
> s/their/its/
> 
> or...
> how about:
> // Status represents the status of an entity.
> ?
> 
> that way we don't need to update all the comments if we
> start using it for something else.

I'll change it as suggested, change all the ones below to use "entity" and
mention in this one the entity could be a unit or a machine.

https://codereview.appspot.com/8667043/diff/1/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/8667043/diff/1/state/machine.go#newcode507
state/machine.go:507: doc := statusDoc{status, info}
On 2013/04/11 16:44:34, rog wrote:
> i'd prefer to leave the fields explicit here, please.

I don't see a good reason, but I'll do it.

https://codereview.appspot.com/8667043/diff/1/state/unit.go
File state/unit.go (right):

https://codereview.appspot.com/8667043/diff/1/state/unit.go#newcode453
state/unit.go:453: doc := statusDoc{status, info}
On 2013/04/11 16:44:34, rog wrote:
> please leave explicit fields.

Done.