Merge lp:~axwalk/juju-core/lp1314430-bootstrap-machine-addresses-1.18 into lp:juju-core/1.18

[Andrew Wilkins]

Set machine addresses during bootstrap

Fixes lp:1314430

https://codereview.appspot.com/99950043/

Set machine addresses during bootstrap

Fixes lp:1314430

https://codereview.appspot.com/99950043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+217815_code.launchpad.net,

Message:
Please take a look.

Description:
Set machine addresses during bootstrap

Fixes lp:1314430

https://code.launchpad.net/~axwalk/juju-core/lp1314430-bootstrap-machine-addresses-1.18/+merge/217815

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/99950043/

Affected files (+99, -17 lines):
   A [revision details]
   M agent/bootstrap.go
   M agent/bootstrap_test.go
   M cmd/jujud/bootstrap.go
   M cmd/jujud/bootstrap_test.go

[Martin Packman (gz)]

LGTM.

https://codereview.appspot.com/99950043/

=== modified file 'agent/bootstrap.go'
--- agent/bootstrap.go	2014-03-05 16:30:01 +0000
+++ agent/bootstrap.go	2014-04-30 19:29:23 +0000
@@ -35,6 +35,9 @@
 // BootstrapMachineConfig holds configuration information
 // to attach to the bootstrap machine.
 type BootstrapMachineConfig struct {
+	// Addresses holds the bootstrap machine's addresses.
+	Addresses []instance.Address
+
 	// Constraints holds the bootstrap machine's constraints.
 	// This value is also used for the environment-level constraints.
 	Constraints constraints.Value
@@ -132,6 +135,7 @@
 		jobs[i] = machineJob
 	}
 	m, err := st.AddOneMachine(state.MachineTemplate{
+		Addresses:               cfg.Addresses,
 		Series:                  version.Current.Series,
 		Nonce:                   state.BootstrapNonce,
 		Constraints:             cfg.Constraints,

=== modified file 'agent/bootstrap_test.go'
--- agent/bootstrap_test.go	2014-03-13 07:54:56 +0000
+++ agent/bootstrap_test.go	2014-04-30 19:29:23 +0000
@@ -63,6 +63,7 @@
 	expectConstraints := constraints.MustParse("mem=1024M")
 	expectHW := instance.MustParseHardware("mem=2048M")
 	mcfg := agent.BootstrapMachineConfig{
+		Addresses:       instance.NewAddresses([]string{"testing.invalid", "0.1.2.3"}),
 		Constraints:     expectConstraints,
 		Jobs:            []params.MachineJob{params.JobHostUnits},
 		InstanceId:      "i-bootstrap",
@@ -101,6 +102,8 @@
 	gotHW, err := m.HardwareCharacteristics()
 	c.Assert(err, gc.IsNil)
 	c.Assert(*gotHW, gc.DeepEquals, expectHW)
+	gotAddrs := m.Addresses()
+	c.Assert(gotAddrs, gc.DeepEquals, mcfg.Addresses)
 
 	// Check that the machine agent's config has been written
 	// and that we can use it to connect to the state.

=== modified file 'cmd/jujud/bootstrap.go'
--- cmd/jujud/bootstrap.go	2014-03-24 03:15:34 +0000
+++ cmd/jujud/bootstrap.go	2014-04-30 19:29:23 +0000
@@ -65,6 +65,22 @@
 	if err := c.Conf.read("machine-0"); err != nil {
 		return err
 	}
+
+	// Get the bootstrap machine's addresses from the provider.
+	env, err := environs.New(envCfg)
+	if err != nil {
+		return err
+	}
+	instanceId := instance.Id(c.InstanceId)
+	instances, err := env.Instances([]instance.Id{instanceId})
+	if err != nil {
+		return err
+	}
+	addrs, err := instances[0].Addresses()
+	if err != nil {
+		return err
+	}
+
 	// agent.Jobs is an optional field in the agent config, and was
 	// introduced after 1.17.2. We default to allowing units on
 	// machine-0 if missing.
@@ -76,6 +92,7 @@
 		}
 	}
 	st, _, err := c.Conf.config.InitializeState(envCfg, agent.BootstrapMachineConfig{
+		Addresses:       addrs,
 		Constraints:     c.Constraints,
 		Jobs:            jobs,
 		InstanceId:      instance.Id(c.InstanceId),

=== modified file 'cmd/jujud/bootstrap_test.go'
--- cmd/jujud/bootstrap_test.go	2014-03-21 14:39:23 +0000
+++ cmd/jujud/bootstrap_test.go	2014-04-30 19:29:23 +0000
@@ -5,16 +5,22 @@
 
 import (
 	"encoding/base64"
+	"io"
+	"io/ioutil"
 
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/config"
+	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
+	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
@@ -29,8 +35,11 @@
 type BootstrapSuite struct {
 	testbase.LoggingSuite
 	testing.MgoSuite
-	dataDir string
-	logDir  string
+	envcfg        string
+	instance      instance.Instance
+	dataDir       string
+	logDir        string
+	bootstrapName string
 }
 
 var _ = gc.Suite(&BootstrapSuite{})
@@ -38,11 +47,13 @@
 func (s *BootstrapSuite) SetUpSuite(c *gc.C) {
 	s.LoggingSuite.SetUpSuite(c)
 	s.MgoSuite.SetUpSuite(c)
+	s.makeTestEnv(c)
 }
 
 func (s *BootstrapSuite) TearDownSuite(c *gc.C) {
 	s.MgoSuite.TearDownSuite(c)
 	s.LoggingSuite.TearDownSuite(c)
+	dummy.Reset()
 }
 
 func (s *BootstrapSuite) SetUpTest(c *gc.C) {
@@ -102,7 +113,7 @@
 
 func (s *BootstrapSuite) TestInitializeEnvironment(c *gc.C) {
 	hw := instance.MustParseHardware("arch=amd64 mem=8G")
-	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig, "--instance-id", "anything", "--hardware", hw.String())
+	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", s.envcfg, "--instance-id", string(s.instance.Id()), "--hardware", hw.String())
 	c.Assert(err, gc.IsNil)
 	err = cmd.Run(nil)
 	c.Assert(err, gc.IsNil)
@@ -120,7 +131,7 @@
 
 	instid, err := machines[0].InstanceId()
 	c.Assert(err, gc.IsNil)
-	c.Assert(instid, gc.Equals, instance.Id("anything"))
+	c.Assert(instid, gc.Equals, s.instance.Id())
 
 	stateHw, err := machines[0].HardwareCharacteristics()
 	c.Assert(err, gc.IsNil)
@@ -135,8 +146,8 @@
 func (s *BootstrapSuite) TestSetConstraints(c *gc.C) {
 	tcons := constraints.Value{Mem: uint64p(2048), CpuCores: uint64p(2)}
 	_, cmd, err := s.initBootstrapCommand(c, nil,
-		"--env-config", testConfig,
-		"--instance-id", "anything",
+		"--env-config", s.envcfg,
+		"--instance-id", string(s.instance.Id()),
 		"--constraints", tcons.String(),
 	)
 	c.Assert(err, gc.IsNil)
@@ -170,7 +181,7 @@
 	expectedJobs := []state.MachineJob{
 		state.JobManageEnviron, state.JobHostUnits,
 	}
-	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig, "--instance-id", "anything")
+	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", s.envcfg, "--instance-id", string(s.instance.Id()))
 	c.Assert(err, gc.IsNil)
 	err = cmd.Run(nil)
 	c.Assert(err, gc.IsNil)
@@ -187,9 +198,31 @@
 	c.Assert(m.Jobs(), gc.DeepEquals, expectedJobs)
 }
 
+func (s *BootstrapSuite) TestMachineAddresses(c *gc.C) {
+	addrs := instance.NewAddresses([]string{"testing.invalid", "0.1.2.3"})
+	dummy.SetInstanceAddresses(s.instance, addrs)
+
+	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", s.envcfg, "--instance-id", string(s.instance.Id()))
+	c.Assert(err, gc.IsNil)
+	err = cmd.Run(nil)
+	c.Assert(err, gc.IsNil)
+
+	st, err := state.Open(&state.Info{
+		Addrs:    []string{testing.MgoServer.Addr()},
+		CACert:   []byte(testing.CACert),
+		Password: testPasswordHash(),
+	}, state.DefaultDialOpts(), environs.NewStatePolicy())
+	c.Assert(err, gc.IsNil)
+	defer st.Close()
+
+	m, err := st.Machine("0")
+	c.Assert(err, gc.IsNil)
+	c.Assert(m.Addresses(), gc.DeepEquals, addrs)
+}
+
 func (s *BootstrapSuite) TestConfiguredMachineJobs(c *gc.C) {
 	jobs := []params.MachineJob{params.JobManageEnviron}
-	_, cmd, err := s.initBootstrapCommand(c, jobs, "--env-config", testConfig, "--instance-id", "anything")
+	_, cmd, err := s.initBootstrapCommand(c, jobs, "--env-config", s.envcfg, "--instance-id", string(s.instance.Id()))
 	c.Assert(err, gc.IsNil)
 	err = cmd.Run(nil)
 	c.Assert(err, gc.IsNil)
@@ -219,7 +252,7 @@
 }
 
 func (s *BootstrapSuite) TestInitialPassword(c *gc.C) {
-	machineConf, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig, "--instance-id", "anything")
+	machineConf, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", s.envcfg, "--instance-id", string(s.instance.Id()))
 	c.Assert(err, gc.IsNil)
 
 	err = cmd.Run(nil)
@@ -333,6 +366,37 @@
 	}
 }
 
+func (s *BootstrapSuite) makeTestEnv(c *gc.C) {
+	attrs := dummy.SampleConfig().Merge(
+		testing.Attrs{
+			"agent-version": version.Current.Number.String(),
+		},
+	).Delete("admin-secret", "ca-private-key")
+
+	cfg, err := config.New(config.NoDefaults, attrs)
+	c.Assert(err, gc.IsNil)
+	provider, err := environs.Provider(cfg.Type())
+	c.Assert(err, gc.IsNil)
+	env, err := provider.Prepare(nullContext(), cfg)
+	c.Assert(err, gc.IsNil)
+
+	envtesting.MustUploadFakeTools(env.Storage())
+	inst, _, err := jujutesting.StartInstance(env, "0")
+	c.Assert(err, gc.IsNil)
+	s.instance = inst
+	s.bootstrapName, err = inst.DNSName()
+	c.Assert(err, gc.IsNil)
+	s.envcfg = b64yaml(env.Config().AllAttrs()).encode()
+}
+
+func nullContext() *cmd.Context {
+	ctx, _ := cmd.DefaultContext()
+	ctx.Stdin = io.LimitReader(nil, 0)
+	ctx.Stdout = ioutil.Discard
+	ctx.Stderr = ioutil.Discard
+	return ctx
+}
+
 type b64yaml map[string]interface{}
 
 func (m b64yaml) encode() string {
@@ -342,11 +406,3 @@
 	}
 	return base64.StdEncoding.EncodeToString(data)
 }
-
-var testConfig = b64yaml(
-	dummy.SampleConfig().Merge(
-		testing.Attrs{
-			"state-server":  false,
-			"agent-version": "3.4.5",
-		},
-	).Delete("admin-secret", "ca-private-key")).encode()