state: add machine with workers

state: add machine with workers

We need the workers to be set at creation
time otherwise there's a race.

https://code.launchpad.net/~rogpeppe/juju-core/090-state-machine-workers/+merge/126768

(do not edit description out of merge proposal)

[rog, 2012-09-27 19:25:31]

Please take a look.

[niemeyer, 2012-09-27 19:39:47]

Very nice. LGTM with trivials:

https://codereview.appspot.com/6564063/diff/2001/cmd/jujud/bootstrap_test.go
File cmd/jujud/bootstrap_test.go (right):

https://codereview.appspot.com/6564063/diff/2001/cmd/jujud/bootstrap_test.go#...
cmd/jujud/bootstrap_test.go:72: c.Assert(m.Workers(), DeepEquals,
[]state.WorkerKind{state.MachineWorker, state.ProvisionerWorker,
state.FirewallerWorker})
This is TestSetMachineId, and it was, in fact, testing only the machine id.
Base64Config is tested below, and we can now have a TestWorkers.

https://codereview.appspot.com/6564063/diff/2001/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/6564063/diff/2001/state/machine.go#newcode49
state/machine.go:49: // Workers returns the workers that the machine agent is
configured
// Workers returns the workers that the machine agent for m must run.

https://codereview.appspot.com/6564063/diff/2001/state/state.go
File state/state.go (right):

https://codereview.appspot.com/6564063/diff/2001/state/state.go#newcode127
state/state.go:127: MachineWorker     WorkerKind = "machine"
s/[Mm]achine/[Mm]achiner/; that's how we call it, so we may as well preserve the
name.

https://codereview.appspot.com/6564063/diff/2001/state/state.go#newcode129
state/state.go:129: FirewallerWorker  WorkerKind = "provisioner"
Something doesn't look quite right with these. :-)

https://codereview.appspot.com/6564063/diff/2001/state/state.go#newcode133
state/state.go:133: // that will run the given workers.
// AddMachine adds a new machine that when deployed will have a
// machine agent running the provided workers.

[fwereade, 2012-09-28 08:37:21]

LGTM

[rog, 2012-09-28 12:45:53]

*** Submitted:

state: add machine with workers

We need the workers to be set at creation
time otherwise there's a race.

R=niemeyer, fwereade
CC=
https://codereview.appspot.com/6564063

https://codereview.appspot.com/6564063/diff/2001/cmd/jujud/bootstrap_test.go
File cmd/jujud/bootstrap_test.go (right):

https://codereview.appspot.com/6564063/diff/2001/cmd/jujud/bootstrap_test.go#...
cmd/jujud/bootstrap_test.go:72: c.Assert(m.Workers(), DeepEquals,
[]state.WorkerKind{state.MachineWorker, state.ProvisionerWorker,
state.FirewallerWorker})
On 2012/09/27 19:39:47, niemeyer wrote:
> This is TestSetMachineId, and it was, in fact, testing only the machine id.
> Base64Config is tested below, and we can now have a TestWorkers.

Done.

https://codereview.appspot.com/6564063/diff/2001/state/machine.go
File state/machine.go (right):

https://codereview.appspot.com/6564063/diff/2001/state/machine.go#newcode49
state/machine.go:49: // Workers returns the workers that the machine agent is
configured
On 2012/09/27 19:39:47, niemeyer wrote:
> // Workers returns the workers that the machine agent for m must run.

Done.

https://codereview.appspot.com/6564063/diff/2001/state/state.go
File state/state.go (right):

https://codereview.appspot.com/6564063/diff/2001/state/state.go#newcode127
state/state.go:127: MachineWorker     WorkerKind = "machine"
On 2012/09/27 19:39:47, niemeyer wrote:
> s/[Mm]achine/[Mm]achiner/; that's how we call it, so we may as well preserve
the
> name.

Done.

https://codereview.appspot.com/6564063/diff/2001/state/state.go#newcode129
state/state.go:129: FirewallerWorker  WorkerKind = "provisioner"
On 2012/09/27 19:39:47, niemeyer wrote:
> Something doesn't look quite right with these. :-)

oops! :-)

https://codereview.appspot.com/6564063/diff/2001/state/state.go#newcode133
state/state.go:133: // that will run the given workers.
On 2012/09/27 19:39:47, niemeyer wrote:
> // AddMachine adds a new machine that when deployed will have a
> // machine agent running the provided workers.

Done.