Merge lp:~axwalk/juju-core/lp1211147-machine-isstateserver into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

Add convenience method Machine.IsStateServer

https://codereview.appspot.com/12745044/

Add convenience method Machine.IsStateServer

https://codereview.appspot.com/12745044/

[Andrew Wilkins (axwalk)]

Reviewers: mp+180277_code.launchpad.net,

Message:
Please take a look.

Description:
Add convenience method Machine.IsStateServer

https://code.launchpad.net/~axwalk/juju-core/lp1211147-machine-isstateserver/+merge/180277

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M state/machine.go
   M state/machine_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-20130809021225-6c5p05y8zs5j83o3
+New revision: <email address hidden>

Index: state/machine.go
=== modified file 'state/machine.go'
--- state/machine.go 2013-08-07 18:02:26 +0000
+++ state/machine.go 2013-08-15 02:03:55 +0000
@@ -167,6 +167,16 @@
   return m.doc.Jobs
  }

+// IsStateServer returns true if the machine has a JobManageState job.
+func (m *Machine) IsStateServer() bool {
+ for _, job := range m.doc.Jobs {
+ if job == JobManageState {
+ return true
+ }
+ }
+ return false
+}
+
  // AgentTools returns the tools that the agent is currently running.
  // It returns an error that satisfies IsNotFound if the tools have not yet
been set.
  func (m *Machine) AgentTools() (*tools.Tools, error) {

Index: state/machine_test.go
=== modified file 'state/machine_test.go'
--- state/machine_test.go 2013-08-08 17:56:28 +0000
+++ state/machine_test.go 2013-08-15 02:03:55 +0000
@@ -58,6 +58,27 @@
   c.Assert(ok, Equals, true)
  }

+func (s *MachineSuite) TestMachineIsStateServer(c *C) {
+ tests := []struct {
+ isStateServer bool
+ jobs []state.MachineJob
+ }{
+ {false, []state.MachineJob{state.JobHostUnits}},
+ {false, []state.MachineJob{state.JobHostUnits, state.JobManageEnviron}},
+ {true, []state.MachineJob{state.JobHostUnits, state.JobManageState,
state.JobManageEnviron}},
+ {true, []state.MachineJob{state.JobManageState}},
+ }
+ for _, test := range tests {
+ params := state.AddMachineParams{
+ Series: "series",
+ Jobs: test.jobs,
+ }
+ m, err := s.State.AddMachineWithConstraints(&params)
+ c.Assert(err, IsNil)
+ c.Assert(m.IsStateServer(), Equals, test.isStateServer)
+ }
+}
+
  func (s *MachineSuite) TestLifeJobManageEnviron(c *C) {
   // A JobManageEnviron machine must never advance lifecycle.
   m, err := s.State.AddMachine("series", state.JobManageEnviron)

[Tim Penhey (thumper)]

On 2013/08/15 02:10:30, axw wrote:
> Please take a look.

LGTM - trivial

https://codereview.appspot.com/12745044/

=== modified file 'state/machine.go'
--- state/machine.go	2013-08-07 18:02:26 +0000
+++ state/machine.go	2013-08-15 02:08:46 +0000
@@ -167,6 +167,16 @@
 	return m.doc.Jobs
 }
 
+// IsStateServer returns true if the machine has a JobManageState job.
+func (m *Machine) IsStateServer() bool {
+	for _, job := range m.doc.Jobs {
+		if job == JobManageState {
+			return true
+		}
+	}
+	return false
+}
+
 // AgentTools returns the tools that the agent is currently running.
 // It returns an error that satisfies IsNotFound if the tools have not yet been set.
 func (m *Machine) AgentTools() (*tools.Tools, error) {

=== modified file 'state/machine_test.go'
--- state/machine_test.go	2013-08-08 17:56:28 +0000
+++ state/machine_test.go	2013-08-15 02:08:46 +0000
@@ -58,6 +58,27 @@
 	c.Assert(ok, Equals, true)
 }
 
+func (s *MachineSuite) TestMachineIsStateServer(c *C) {
+	tests := []struct {
+		isStateServer bool
+		jobs          []state.MachineJob
+	}{
+		{false, []state.MachineJob{state.JobHostUnits}},
+		{false, []state.MachineJob{state.JobHostUnits, state.JobManageEnviron}},
+		{true, []state.MachineJob{state.JobHostUnits, state.JobManageState, state.JobManageEnviron}},
+		{true, []state.MachineJob{state.JobManageState}},
+	}
+	for _, test := range tests {
+		params := state.AddMachineParams{
+			Series: "series",
+			Jobs:   test.jobs,
+		}
+		m, err := s.State.AddMachineWithConstraints(&params)
+		c.Assert(err, IsNil)
+		c.Assert(m.IsStateServer(), Equals, test.isStateServer)
+	}
+}
+
 func (s *MachineSuite) TestLifeJobManageEnviron(c *C) {
 	// A JobManageEnviron machine must never advance lifecycle.
 	m, err := s.State.AddMachine("series", state.JobManageEnviron)