add MachineNonce to agent.Conf and MachineConfig

add MachineNonce to agent.Conf and MachineConfig

This is the first step towards several incoming
CLs about making sure the provisioned machines
match the actual instances they're running on.

First a MachineNonce is introduced, which will
be set be the provisioner and checked by the
agents.

Here we only add it to a few places, mostly in
agent.Conf and MachineConfig (as fields).
There are a few TODOs about using fake values
for now, until we start using them in the
upcoming CLs.

https://code.launchpad.net/~dimitern/juju-core/025-add-machinenonce-to-agent-conf-and-machine-config/+merge/157422

(do not edit description out of merge proposal)

[dimitern, 2013-04-05 16:03:49]

Please take a look.

[fwereade, 2013-04-05 17:06:00]

LGTM with a load of deletions :)

https://codereview.appspot.com/8247045/diff/1/cmd/jujud/agent_test.go
File cmd/jujud/agent_test.go (right):

https://codereview.appspot.com/8247045/diff/1/cmd/jujud/agent_test.go#newcode269
cmd/jujud/agent_test.go:269: MachineNonce: "FAKE_NONCE",
d

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

https://codereview.appspot.com/8247045/diff/1/cmd/jujud/bootstrap_test.go#new...
cmd/jujud/bootstrap_test.go:48: MachineNonce: "FAKE_NONCE",
d

https://codereview.appspot.com/8247045/diff/1/environs/agent/agent_test.go
File environs/agent/agent_test.go (right):

https://codereview.appspot.com/8247045/diff/1/environs/agent/agent_test.go#ne...
environs/agent/agent_test.go:226: about: "no machine nonce",
This should be valid.

https://codereview.appspot.com/8247045/diff/1/worker/deployer/simple_test.go
File worker/deployer/simple_test.go (right):

https://codereview.appspot.com/8247045/diff/1/worker/deployer/simple_test.go#...
worker/deployer/simple_test.go:190: MachineNonce: "FAKE_NONCE",
d

(*definitely* d -- this is not a machine agent!)

https://codereview.appspot.com/8247045/diff/1/worker/environ.go
File worker/environ.go (right):

https://codereview.appspot.com/8247045/diff/1/worker/environ.go#newcode12
worker/environ.go:12: var ErrTerminateAgent = errors.New("agent entity is should
be terminated")
s/is //

...but I guess I can live with the "should" :)

[dimitern, 2013-04-08 09:56:52]

Please take a look.

https://codereview.appspot.com/8247045/diff/1/cmd/jujud/agent_test.go
File cmd/jujud/agent_test.go (right):

https://codereview.appspot.com/8247045/diff/1/cmd/jujud/agent_test.go#newcode269
cmd/jujud/agent_test.go:269: MachineNonce: "FAKE_NONCE",
On 2013/04/05 17:06:00, fwereade wrote:
> d

Done.

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

https://codereview.appspot.com/8247045/diff/1/cmd/jujud/bootstrap_test.go#new...
cmd/jujud/bootstrap_test.go:48: MachineNonce: "FAKE_NONCE",
On 2013/04/05 17:06:00, fwereade wrote:
> d

Done.

https://codereview.appspot.com/8247045/diff/1/environs/agent/agent_test.go
File environs/agent/agent_test.go (right):

https://codereview.appspot.com/8247045/diff/1/environs/agent/agent_test.go#ne...
environs/agent/agent_test.go:226: about: "no machine nonce",
On 2013/04/05 17:06:00, fwereade wrote:
> This should be valid.

Done.

https://codereview.appspot.com/8247045/diff/1/worker/deployer/simple_test.go
File worker/deployer/simple_test.go (right):

https://codereview.appspot.com/8247045/diff/1/worker/deployer/simple_test.go#...
worker/deployer/simple_test.go:190: MachineNonce: "FAKE_NONCE",
On 2013/04/05 17:06:00, fwereade wrote:
> d
> 
> (*definitely* d -- this is not a machine agent!)

Done.

https://codereview.appspot.com/8247045/diff/1/worker/environ.go
File worker/environ.go (right):

https://codereview.appspot.com/8247045/diff/1/worker/environ.go#newcode12
worker/environ.go:12: var ErrTerminateAgent = errors.New("agent entity is should
be terminated")
On 2013/04/05 17:06:00, fwereade wrote:
> s/is //
> 
> ...but I guess I can live with the "should" :)

Done.

[rog, 2013-04-08 10:40:51]

LGTM with a couple of minor points addressed below.

https://codereview.appspot.com/8247045/diff/7001/environs/agent/agent_test.go
File environs/agent/agent_test.go (right):

https://codereview.appspot.com/8247045/diff/7001/environs/agent/agent_test.go...
environs/agent/agent_test.go:33: MachineNonce: "dummy",
i think you can omit MachineNonce from most of the below configurations, as
MongoPort is omitted, for example. i think we probably only need one extra test
case to test an extra field, which means less maintenance later if we choose to
change MachineNonce.

https://codereview.appspot.com/8247045/diff/7001/worker/environ.go
File worker/environ.go (right):

https://codereview.appspot.com/8247045/diff/7001/worker/environ.go#newcode12
worker/environ.go:12: var ErrTerminateAgent = errors.New("agent entity should be
terminated")
s/entity //

[dimitern, 2013-04-08 12:20:58]

*** Submitted:

add MachineNonce to agent.Conf and MachineConfig

This is the first step towards several incoming
CLs about making sure the provisioned machines
match the actual instances they're running on.

First a MachineNonce is introduced, which will
be set be the provisioner and checked by the
agents.

Here we only add it to a few places, mostly in
agent.Conf and MachineConfig (as fields).
There are a few TODOs about using fake values
for now, until we start using them in the
upcoming CLs.

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

https://codereview.appspot.com/8247045/diff/7001/environs/agent/agent_test.go
File environs/agent/agent_test.go (right):

https://codereview.appspot.com/8247045/diff/7001/environs/agent/agent_test.go...
environs/agent/agent_test.go:33: MachineNonce: "dummy",
On 2013/04/08 10:40:52, rog wrote:
> i think you can omit MachineNonce from most of the below configurations, as
> MongoPort is omitted, for example. i think we probably only need one extra
test
> case to test an extra field, which means less maintenance later if we choose
to
> change MachineNonce.

I removed it from all but the first case, to make sure it passes with it.

https://codereview.appspot.com/8247045/diff/7001/worker/environ.go
File worker/environ.go (right):

https://codereview.appspot.com/8247045/diff/7001/worker/environ.go#newcode12
worker/environ.go:12: var ErrTerminateAgent = errors.New("agent entity should be
terminated")
On 2013/04/08 10:40:52, rog wrote:
> s/entity //

Done.