Merge lp:~axwalk/juju-core/lp1254642-manual-provision-apiinfo into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

environs/manual: add test for API/State info

There was a regression in manual provisioning
wherein the APIInfo was being populated with
state server (mongo) addresses. This led to
manually provisioned machines being unable to
connect to the API server.

Kapil fixed this in another branch; this is
a test to ensure that it doesn't regress
again.

https://codereview.appspot.com/34630043/

environs/manual: add test for API/State info

There was a regression in manual provisioning
wherein the APIInfo was being populated with
state server (mongo) addresses. This led to
manually provisioned machines being unable to
connect to the API server.

Kapil fixed this in another branch; this is
a test to ensure that it doesn't regress
again.

https://codereview.appspot.com/34630043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+197011_code.launchpad.net,

Message:
Please take a look.

Description:
environs/manual: add test for API/State info

There was a regression in manual provisioning
wherein the APIInfo was being populated with
state server (mongo) addresses. This led to
manually provisioned machines being unable to
connect to the API server.

Kapil fixed this in another branch; this is
a test to ensure that it doesn't regress
again.

https://code.launchpad.net/~axwalk/juju-core/lp1254642-manual-provision-apiinfo/+merge/197011

(do not edit description out of merge proposal)

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

Affected files (+24, -0 lines):
   A [revision details]
   M environs/manual/provisioner_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20131128012708-7muo6qwh39wu805f
+New revision: <email address hidden>

Index: environs/manual/provisioner_test.go
=== modified file 'environs/manual/provisioner_test.go'
--- environs/manual/provisioner_test.go 2013-11-18 05:41:36 +0000
+++ environs/manual/provisioner_test.go 2013-11-28 05:33:34 +0000
@@ -12,6 +12,7 @@
   envtesting "launchpad.net/juju-core/environs/testing"
   "launchpad.net/juju-core/instance"
   "launchpad.net/juju-core/juju/testing"
+ "launchpad.net/juju-core/state"
   "launchpad.net/juju-core/state/api/params"
   jc "launchpad.net/juju-core/testing/checkers"
   "launchpad.net/juju-core/version"
@@ -89,3 +90,24 @@
   _, err = ProvisionMachine(args)
   c.Assert(err, gc.ErrorMatches, "error checking if provisioned: exit
status 255")
  }
+
+func (s *provisionerSuite) TestCreateMachineConfig(c *gc.C) {
+ const series = "precise"
+ const arch = "amd64"
+ defer fakeSSH{Series: series, Arch: arch}.install(c).Restore()
+ machineId, err := ProvisionMachine(s.getArgs(c))
+ c.Assert(err, gc.IsNil)
+
+ // Now check what we would've configured it with.
+ client := s.APIConn.State.Client()
+ mcfg, err := createMachineConfig(client, machineId, series, arch,
state.BootstrapNonce, "/var/lib/juju")
+ c.Assert(err, gc.IsNil)
+ c.Assert(mcfg, gc.NotNil)
+ c.Assert(mcfg.APIInfo, gc.NotNil)
+ c.Assert(mcfg.StateInfo, gc.NotNil)
+
+ stateInfo, apiInfo, err := s.APIConn.Environ.StateInfo()
+ c.Assert(err, gc.IsNil)
+ c.Assert(mcfg.APIInfo.Addrs, gc.DeepEquals, apiInfo.Addrs)
+ c.Assert(mcfg.StateInfo.Addrs, gc.DeepEquals, stateInfo.Addrs)
+}

[John A Meinel (jameinel)]

LGTM

https://codereview.appspot.com/34630043/

=== modified file 'environs/manual/provisioner_test.go'
--- environs/manual/provisioner_test.go	2013-11-18 05:41:36 +0000
+++ environs/manual/provisioner_test.go	2013-11-28 05:44:15 +0000
@@ -12,6 +12,7 @@
 	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
+	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	jc "launchpad.net/juju-core/testing/checkers"
 	"launchpad.net/juju-core/version"
@@ -89,3 +90,24 @@
 	_, err = ProvisionMachine(args)
 	c.Assert(err, gc.ErrorMatches, "error checking if provisioned: exit status 255")
 }
+
+func (s *provisionerSuite) TestCreateMachineConfig(c *gc.C) {
+	const series = "precise"
+	const arch = "amd64"
+	defer fakeSSH{Series: series, Arch: arch}.install(c).Restore()
+	machineId, err := ProvisionMachine(s.getArgs(c))
+	c.Assert(err, gc.IsNil)
+
+	// Now check what we would've configured it with.
+	client := s.APIConn.State.Client()
+	mcfg, err := createMachineConfig(client, machineId, series, arch, state.BootstrapNonce, "/var/lib/juju")
+	c.Assert(err, gc.IsNil)
+	c.Assert(mcfg, gc.NotNil)
+	c.Assert(mcfg.APIInfo, gc.NotNil)
+	c.Assert(mcfg.StateInfo, gc.NotNil)
+
+	stateInfo, apiInfo, err := s.APIConn.Environ.StateInfo()
+	c.Assert(err, gc.IsNil)
+	c.Assert(mcfg.APIInfo.Addrs, gc.DeepEquals, apiInfo.Addrs)
+	c.Assert(mcfg.StateInfo.Addrs, gc.DeepEquals, stateInfo.Addrs)
+}