state/machine: new agent API

state/apiserver/machine/machiner_test.go

Index: state/apiserver/machine/machiner_test.go
=== modified file 'state/apiserver/machine/machiner_test.go'
--- state/apiserver/machiner/machiner_test.go	2013-06-06 17:09:49 +0000
+++ state/apiserver/machine/machiner_test.go	2013-06-18 11:04:41 +0000
@@ -1,85 +1,33 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package machiner_test
+package machine_test
 
 import (
 	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/state/apiserver/common"
-	"launchpad.net/juju-core/state/apiserver/machiner"
-	coretesting "launchpad.net/juju-core/testing"
-	stdtesting "testing"
+	"launchpad.net/juju-core/state/apiserver/machine"
 )
 
-func Test(t *stdtesting.T) {
-	coretesting.MgoTestPackage(t)
-}
-
 type machinerSuite struct {
-	testing.JujuConnSuite
-
-	authorizer *fakeAuthorizer
-	machiner   *machiner.Machiner
-
-	machine0 *state.Machine
-	machine1 *state.Machine
+	commonSuite
+	machiner *machine.MachinerAPI
 }
 
 var _ = Suite(&machinerSuite{})
 
-// fakeAuthorizer implements the common.Authorizer interface.
-type fakeAuthorizer struct {
-	tag          string
-	loggedIn     bool
-	manager      bool
-	machineAgent bool
-}
-
-func (fa *fakeAuthorizer) IsLoggedIn() bool {
-	return fa.loggedIn
-}
-
-func (fa *fakeAuthorizer) AuthOwner(entity common.Tagger) bool {
-	return entity.Tag() == fa.tag
-}
-
-func (fa *fakeAuthorizer) AuthEnvironManager() bool {
-	return fa.manager
-}
-
-func (fa *fakeAuthorizer) AuthMachineAgent() bool {
-	return fa.machineAgent
-}
-
 func (s *machinerSuite) SetUpTest(c *C) {
-	s.JujuConnSuite.SetUpTest(c)
-
-	// Create a machine so that we can login as its agent
-	var err error
-	s.machine0, err = s.State.AddMachine("series", state.JobManageEnviron)
-	c.Assert(err, IsNil)
-	// Add another normal machine
-	s.machine1, err = s.State.AddMachine("series", state.JobHostUnits)
-	c.Assert(err, IsNil)
-
-	// Create a fakeAuthorizer so we can check permissions.
-	s.authorizer = &fakeAuthorizer{
-		tag:          state.MachineTag(s.machine1.Id()),
-		loggedIn:     true,
-		manager:      false,
-		machineAgent: true,
-	}
+	s.commonSuite.SetUpTest(c)
 
 	// Create a machiner API for machine 1.
-	s.machiner, err = machiner.New(
+	machiner, err := machine.NewMachinerAPI(
 		s.State,
 		s.authorizer,
 	)
 	c.Assert(err, IsNil)
+	s.machiner = machiner
 }
 
 func (s *machinerSuite) assertError(c *C, err *params.Error, code, messageRegexp string) {
@@ -91,7 +39,7 @@
 func (s *machinerSuite) TestMachinerFailsWithNonMachineAgentUser(c *C) {
 	anAuthorizer := s.authorizer
 	anAuthorizer.machineAgent = false
-	aMachiner, err := machiner.New(s.State, anAuthorizer)
+	aMachiner, err := machine.NewMachinerAPI(s.State, anAuthorizer)
 	c.Assert(err, NotNil)
 	c.Assert(aMachiner, IsNil)
 	c.Assert(err, ErrorMatches, "permission denied")
@@ -100,7 +48,7 @@
 func (s *machinerSuite) TestMachinerFailsWhenNotLoggedIn(c *C) {
 	anAuthorizer := s.authorizer
 	anAuthorizer.loggedIn = false
-	aMachiner, err := machiner.New(s.State, anAuthorizer)
+	aMachiner, err := machine.NewMachinerAPI(s.State, anAuthorizer)
 	c.Assert(err, NotNil)
 	c.Assert(aMachiner, IsNil)
 	c.Assert(err, ErrorMatches, "not logged in")