Merge lp:~thumper/juju-core/move-environs-tools into lp:~go-bot/juju-core/trunk

[Tim Penhey]

remove state.Tools and use tools.Tools

Mega-move, but this branch just moves environ/agent/tools.go
and tests into tools.

Also moves state bson marshalling into tools.

https://codereview.appspot.com/11028043/

[Tim Penhey (thumper)]

Reviewers: mp+173645_code.launchpad.net,

Message:
Please take a look.

Description:
remove state.Tools and use tools.Tools

Mega-move, but this branch just moves environ/agent/tools.go
and tests into tools.

Also moves state bson marshalling into tools.

https://code.launchpad.net/~thumper/juju-core/move-environs-tools/+merge/173645

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M cmd/juju/bootstrap_test.go
   M cmd/juju/status.go
   M cmd/juju/status_test.go
   M cmd/juju/synctools.go
   M cmd/juju/synctools_test.go
   M cmd/juju/upgradejuju.go
   M cmd/juju/upgradejuju_test.go
   M cmd/jujud/agent.go
   M cmd/jujud/agent_test.go
   M cmd/jujud/machine_test.go
   M cmd/jujud/unit_test.go
   M cmd/jujud/upgrade.go
   M cmd/jujud/upgrade_test.go
   M container/lxc/lxc.go
   M container/lxc/lxc_test.go
   M environs/agent/agent.go
   M environs/cloudinit/cloudinit.go
   M environs/cloudinit/cloudinit_test.go
   M environs/ec2/ec2.go
   M environs/jujutest/livetests.go
   M environs/maas/environ.go
   M environs/maas/environ_test.go
   M environs/maas/util_test.go
   M environs/openstack/export_test.go
   M environs/openstack/provider.go
   M environs/testing/storage.go
   M environs/testing/tools.go
   M environs/tools.go
   M environs/tools_test.go
   M state/api/params/internal.go
   M state/api/upgrader/upgrader_test.go
   M state/apiserver/upgrader/upgrader.go
   M state/apiserver/upgrader/upgrader_test.go
   M state/machine.go
   M state/machine_test.go
   M state/state.go
   M state/state_test.go
   M state/tools_test.go
   M state/unit.go
   M tools/agent.go
   M tools/agent_test.go
   M tools/build.go
   M tools/diskmanager.go
   M tools/diskmanager_test.go
   M tools/export_test.go
   M tools/list.go
   M tools/list_test.go
   A tools/marshal.go
   A tools/marshal_test.go
   M tools/storage.go
   M tools/storage_test.go
   M tools/tools_test.go
   M worker/deployer/simple.go
   M worker/deployer/simple_test.go
   M worker/provisioner/lxc-broker.go
   M worker/provisioner/lxc-broker_test.go
   M worker/provisioner/provisioner.go
   M worker/uniter/tools_test.go
   M worker/uniter/uniter.go
   M worker/uniter/uniter_test.go

[John A Meinel (jameinel)]

We chatted a bit on IRC, and I think we sorted out that we'd rather call
it "agent.Tools". It also matches what William would like to see, which
is that most of environs/agent becomes just a top level agent/* package
that has 0 dependencies on environs. (if we have things that depend on
environs we can leave a different package there.)

So +1 on the removal of state.Tools and replacing it with something
better. I'd just like us to call that agent.Tools before we land this
patch, so we don't have to do yet-another rename-of-everything.

https://codereview.appspot.com/11028043/

[Dimiter Naydenov (dimitern)]

LGTM, nice!

https://codereview.appspot.com/11028043/

Unmerged revisions

1413. By Tim Penhey on 2013-07-09

Missed one.

1412. By Tim Penhey on 2013-07-09

Make the tests pass.

1411. By Tim Penhey on 2013-07-09

More moves and tests in tools pass.

1410. By Tim Penhey on 2013-07-09

builds now.

1409. By Tim Penhey on 2013-07-09

Part way through the move.

=== modified file 'cmd/juju/bootstrap_test.go'
--- cmd/juju/bootstrap_test.go	2013-06-21 16:57:26 +0000
+++ cmd/juju/bootstrap_test.go	2013-07-09 05:06:28 +0000
@@ -11,8 +11,8 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/dummy"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"strings"
 )

=== modified file 'cmd/juju/status.go'
--- cmd/juju/status.go	2013-06-30 23:42:39 +0000
+++ cmd/juju/status.go	2013-07-09 05:06:28 +0000
@@ -15,6 +15,7 @@
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils/set"
 	"strings"
 )
@@ -319,7 +320,7 @@
 type stateAgent interface {
 	lifer
 	AgentAlive() (bool, error)
-	AgentTools() (*state.Tools, error)
+	AgentTools() (*tools.Tools, error)
 	Status() (params.Status, string, error)
 }
 

=== modified file 'cmd/juju/status_test.go'
--- cmd/juju/status_test.go	2013-07-01 00:52:38 +0000
+++ cmd/juju/status_test.go	2013-07-09 05:06:28 +0000
@@ -19,6 +19,7 @@
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/presence"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"net/url"
 	"time"
@@ -232,7 +233,7 @@
 			},
 		},
 
-		setTools{"0", &state.Tools{
+		setTools{"0", &tools.Tools{
 			Binary: version.Binary{
 				Number: version.MustParse("1.2.3"),
 				Series: "gutsy",
@@ -923,7 +924,7 @@
 
 type setTools struct {
 	machineId string
-	tools     *state.Tools
+	tools     *tools.Tools
 }
 
 func (st setTools) step(c *C, ctx *context) {

=== modified file 'cmd/juju/synctools.go'
--- cmd/juju/synctools.go	2013-06-20 06:42:25 +0000
+++ cmd/juju/synctools.go	2013-07-09 05:06:28 +0000
@@ -12,9 +12,8 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/ec2"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/state"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
@@ -63,7 +62,7 @@
 }
 
 func copyOne(
-	tool *state.Tools, source environs.StorageReader,
+	tool *tools.Tools, source environs.StorageReader,
 	target environs.Storage, ctx *cmd.Context,
 ) error {
 	toolsName := tools.StorageName(tool.Binary)
@@ -90,7 +89,7 @@
 }
 
 func copyTools(
-	tools []*state.Tools, source environs.StorageReader,
+	tools []*tools.Tools, source environs.StorageReader,
 	target environs.Storage, dryRun bool, ctx *cmd.Context,
 ) error {
 	for _, tool := range tools {

=== modified file 'cmd/juju/synctools_test.go'
--- cmd/juju/synctools_test.go	2013-06-20 13:42:24 +0000
+++ cmd/juju/synctools_test.go	2013-07-09 05:06:28 +0000
@@ -9,8 +9,8 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/dummy"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 

=== modified file 'cmd/juju/upgradejuju.go'
--- cmd/juju/upgradejuju.go	2013-05-31 01:02:53 +0000
+++ cmd/juju/upgradejuju.go	2013-07-09 05:06:28 +0000
@@ -10,10 +10,10 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/log"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 

=== modified file 'cmd/juju/upgradejuju_test.go'
--- cmd/juju/upgradejuju_test.go	2013-05-02 15:55:42 +0000
+++ cmd/juju/upgradejuju_test.go	2013-07-09 05:06:28 +0000
@@ -8,10 +8,9 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/environs"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/juju/testing"
-	"launchpad.net/juju-core/state"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
@@ -282,7 +281,7 @@
 // consuming build from source.
 // TODO(fwereade) better factor environs/tools such that build logic is
 // exposed and can itself be neatly mocked?
-func mockUploadTools(putter tools.URLPutter, forceVersion *version.Number, series ...string) (*state.Tools, error) {
+func mockUploadTools(putter tools.URLPutter, forceVersion *version.Number, series ...string) (*tools.Tools, error) {
 	storage := putter.(environs.Storage)
 	vers := version.Current
 	if forceVersion != nil {

=== modified file 'cmd/jujud/agent.go'
--- cmd/jujud/agent.go	2013-07-08 16:59:14 +0000
+++ cmd/jujud/agent.go	2013-07-09 05:06:28 +0000
@@ -14,6 +14,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/worker"
 	"launchpad.net/juju-core/worker/deployer"
 	"time"
@@ -84,7 +85,7 @@
 // that represent running agents.
 type AgentState interface {
 	// SetAgentTools sets the tools that the agent is currently running.
-	SetAgentTools(tools *state.Tools) error
+	SetAgentTools(tools *tools.Tools) error
 	Tag() string
 	SetMongoPassword(password string) error
 	Life() state.Life

=== modified file 'cmd/jujud/agent_test.go'
--- cmd/jujud/agent_test.go	2013-06-21 16:57:26 +0000
+++ cmd/jujud/agent_test.go	2013-07-09 05:06:28 +0000
@@ -10,11 +10,11 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs/agent"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/machineagent"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker"
 	"net/http"
@@ -44,8 +44,8 @@
 	}
 }
 
-func mkTools(s string) *state.Tools {
-	return &state.Tools{
+func mkTools(s string) *tools.Tools {
+	return &tools.Tools{
 		Binary: version.MustParseBinary(s + "-foo-bar"),
 	}
 }
@@ -117,11 +117,11 @@
 // primeAgent writes the configuration file and tools
 // for an agent with the given entity name.
 // It returns the agent's configuration and the current tools.
-func (s *agentSuite) primeAgent(c *C, tag, password string) (*agent.Conf, *state.Tools) {
-	tools := s.primeTools(c, version.Current)
-	tools1, err := agent.ChangeAgentTools(s.DataDir(), tag, version.Current)
+func (s *agentSuite) primeAgent(c *C, tag, password string) (*agent.Conf, *tools.Tools) {
+	tools0 := s.primeTools(c, version.Current)
+	tools1, err := tools.ChangeAgentTools(s.DataDir(), tag, version.Current)
 	c.Assert(err, IsNil)
-	c.Assert(tools1, DeepEquals, tools)
+	c.Assert(tools1, DeepEquals, tools0)
 
 	conf := &agent.Conf{
 		DataDir:   s.DataDir(),
@@ -134,7 +134,7 @@
 	conf.APIInfo.Password = password
 	err = conf.Write()
 	c.Assert(err, IsNil)
-	return conf, tools
+	return conf, tools0
 }
 
 // initAgent initialises the given agent command with additional
@@ -156,7 +156,7 @@
 	c.Assert(err, IsNil)
 }
 
-func (s *agentSuite) uploadTools(c *C, vers version.Binary) *state.Tools {
+func (s *agentSuite) uploadTools(c *C, vers version.Binary) *tools.Tools {
 	tgz := coretesting.TarGz(
 		coretesting.NewTarFile("jujud", 0777, "jujud contents "+vers.String()),
 	)
@@ -165,22 +165,22 @@
 	c.Assert(err, IsNil)
 	url, err := s.Conn.Environ.Storage().URL(tools.StorageName(vers))
 	c.Assert(err, IsNil)
-	return &state.Tools{URL: url, Binary: vers}
+	return &tools.Tools{URL: url, Binary: vers}
 }
 
 // primeTools sets up the current version of the tools to vers and
 // makes sure that they're available JujuConnSuite's DataDir.
-func (s *agentSuite) primeTools(c *C, vers version.Binary) *state.Tools {
+func (s *agentSuite) primeTools(c *C, vers version.Binary) *tools.Tools {
 	err := os.RemoveAll(filepath.Join(s.DataDir(), "tools"))
 	c.Assert(err, IsNil)
 	version.Current = vers
-	tools := s.uploadTools(c, vers)
-	resp, err := http.Get(tools.URL)
+	uploadedTools := s.uploadTools(c, vers)
+	resp, err := http.Get(uploadedTools.URL)
 	c.Assert(err, IsNil)
 	defer resp.Body.Close()
-	err = agent.UnpackTools(s.DataDir(), tools, resp.Body)
+	err = tools.UnpackTools(s.DataDir(), uploadedTools, resp.Body)
 	c.Assert(err, IsNil)
-	return tools
+	return uploadedTools
 }
 
 func (s *agentSuite) testOpenAPIState(c *C, ent entity, agentCmd Agent) {
@@ -246,7 +246,7 @@
 	assertOpen(conf)
 }
 
-func (s *agentSuite) testUpgrade(c *C, agent runner, currentTools *state.Tools) {
+func (s *agentSuite) testUpgrade(c *C, agent runner, currentTools *tools.Tools) {
 	newVers := version.Current
 	newVers.Patch++
 	newTools := s.uploadTools(c, newVers)

=== modified file 'cmd/jujud/machine_test.go'
--- cmd/jujud/machine_test.go	2013-06-28 12:26:09 +0000
+++ cmd/jujud/machine_test.go	2013-07-09 05:06:28 +0000
@@ -20,6 +20,7 @@
 	"launchpad.net/juju-core/state/watcher"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"path/filepath"
 	"reflect"
@@ -59,7 +60,7 @@
 // primeAgent adds a new Machine to run the given jobs, and sets up the
 // machine agent's directory.  It returns the new machine, the
 // agent's configuration and the tools currently running.
-func (s *MachineSuite) primeAgent(c *C, jobs ...state.MachineJob) (*state.Machine, *agent.Conf, *state.Tools) {
+func (s *MachineSuite) primeAgent(c *C, jobs ...state.MachineJob) (*state.Machine, *agent.Conf, *tools.Tools) {
 	m, err := s.State.InjectMachine("series", constraints.Value{}, "ardbeg-0", jobs...)
 	c.Assert(err, IsNil)
 	err = m.SetMongoPassword("machine-password")

=== modified file 'cmd/jujud/unit_test.go'
--- cmd/jujud/unit_test.go	2013-06-27 19:25:00 +0000
+++ cmd/jujud/unit_test.go	2013-07-09 05:06:28 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"time"
 )
 
@@ -32,7 +33,7 @@
 
 // primeAgent creates a unit, and sets up the unit agent's directory.
 // It returns the new unit and the agent's configuration.
-func (s *UnitSuite) primeAgent(c *C) (*state.Unit, *agent.Conf, *state.Tools) {
+func (s *UnitSuite) primeAgent(c *C) (*state.Unit, *agent.Conf, *tools.Tools) {
 	svc, err := s.State.AddService("wordpress", s.AddTestingCharm(c, "wordpress"))
 	c.Assert(err, IsNil)
 	unit, err := svc.AddUnit()

=== modified file 'cmd/jujud/upgrade.go'
--- cmd/jujud/upgrade.go	2013-06-19 09:47:38 +0000
+++ cmd/jujud/upgrade.go	2013-07-09 05:06:28 +0000
@@ -7,11 +7,11 @@
 	"fmt"
 	"launchpad.net/juju-core/downloader"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/agent"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/watcher"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/tomb"
 	"os"
@@ -36,8 +36,8 @@
 // an upgrade is ready to be performed and a restart is due.
 type UpgradeReadyError struct {
 	AgentName string
-	OldTools  *state.Tools
-	NewTools  *state.Tools
+	OldTools  *tools.Tools
+	NewTools  *tools.Tools
 	DataDir   string
 }
 
@@ -47,7 +47,7 @@
 
 // ChangeAgentTools does the actual agent upgrade.
 func (e *UpgradeReadyError) ChangeAgentTools() error {
-	tools, err := agent.ChangeAgentTools(e.DataDir, e.AgentName, e.NewTools.Binary)
+	tools, err := tools.ChangeAgentTools(e.DataDir, e.AgentName, e.NewTools.Binary)
 	if err != nil {
 		return err
 	}
@@ -88,13 +88,13 @@
 
 func (u *Upgrader) run() error {
 	// Let the state know the version that is currently running.
-	currentTools, err := agent.ReadTools(u.dataDir, version.Current)
+	currentTools, err := tools.ReadTools(u.dataDir, version.Current)
 	if err != nil {
 		// Don't abort everything because we can't find the tools directory.
 		// The problem should sort itself out as we will immediately
 		// download some more tools and upgrade.
 		log.Warningf("upgrader cannot read current tools: %v", err)
-		currentTools = &state.Tools{
+		currentTools = &tools.Tools{
 			Binary: version.Current,
 		}
 	}
@@ -118,7 +118,7 @@
 	// TODO(rog) retry downloads when they fail.
 	var (
 		download      *downloader.Download
-		downloadTools *state.Tools
+		downloadTools *tools.Tools
 		downloadDone  <-chan downloader.Status
 	)
 	// If we're killed early on (probably as a result of some other
@@ -189,7 +189,7 @@
 				Series: version.Current.Series,
 				Arch:   version.Current.Arch,
 			}
-			if tools, err := agent.ReadTools(u.dataDir, required); err == nil {
+			if tools, err := tools.ReadTools(u.dataDir, required); err == nil {
 				// The exact tools have already been downloaded, so use them.
 				return u.upgradeReady(currentTools, tools)
 			}
@@ -208,24 +208,24 @@
 			downloadTools = tools
 			downloadDone = download.Done()
 		case status := <-downloadDone:
-			tools := downloadTools
+			localTools := downloadTools
 			download, downloadTools, downloadDone = nil, nil, nil
 			if status.Err != nil {
-				log.Errorf("upgrader download of %v failed: %v", tools.Binary, status.Err)
+				log.Errorf("upgrader download of %v failed: %v", localTools.Binary, status.Err)
 				noDelay()
 				break
 			}
-			err := agent.UnpackTools(u.dataDir, tools, status.File)
+			err := tools.UnpackTools(u.dataDir, localTools, status.File)
 			status.File.Close()
 			if err := os.Remove(status.File.Name()); err != nil {
 				log.Warningf("upgrader cannot remove temporary download file: %v", err)
 			}
 			if err != nil {
-				log.Errorf("upgrader cannot unpack %v tools: %v", tools.Binary, err)
+				log.Errorf("upgrader cannot unpack %v tools: %v", localTools.Binary, err)
 				noDelay()
 				break
 			}
-			return u.upgradeReady(currentTools, tools)
+			return u.upgradeReady(currentTools, localTools)
 		case <-tomb.Dying():
 			if download != nil {
 				return fmt.Errorf("upgrader aborted download of %q", downloadTools.URL)
@@ -236,7 +236,7 @@
 	panic("not reached")
 }
 
-func (u *Upgrader) upgradeReady(old, new *state.Tools) *UpgradeReadyError {
+func (u *Upgrader) upgradeReady(old, new *tools.Tools) *UpgradeReadyError {
 	return &UpgradeReadyError{
 		AgentName: u.agentState.Tag(),
 		OldTools:  old,

=== modified file 'cmd/jujud/upgrade_test.go'
--- cmd/jujud/upgrade_test.go	2013-05-24 07:04:48 +0000
+++ cmd/jujud/upgrade_test.go	2013-07-09 05:06:28 +0000
@@ -7,11 +7,10 @@
 	"fmt"
 	"io/ioutil"
 	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/environs/agent"
 	"launchpad.net/juju-core/environs/dummy"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/state"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker"
 	"path/filepath"
@@ -36,7 +35,7 @@
 }
 
 func (s *UpgraderSuite) TestUpgraderStop(c *C) {
-	u := s.startUpgrader(c, &state.Tools{Binary: version.Current})
+	u := s.startUpgrader(c, &tools.Tools{Binary: version.Current})
 	err := u.Stop()
 	c.Assert(err, IsNil)
 }
@@ -135,7 +134,7 @@
 		// ...but it also puts tools in storage we don't need, which is why we
 		// don't clean up garbage from earlier runs first.
 		envtesting.RemoveAllTools(c, s.Conn.Environ)
-		uploaded := make(map[version.Binary]*state.Tools)
+		uploaded := make(map[version.Binary]*tools.Tools)
 		for _, vers := range test.available {
 			tools := s.uploadTools(c, vers)
 			uploaded[vers] = tools
@@ -153,17 +152,17 @@
 			}
 
 			ug := waitDeath(c, u)
-			tools := uploaded[test.upgrade]
-			c.Check(ug.NewTools, DeepEquals, tools)
+			uploadedTools := uploaded[test.upgrade]
+			c.Check(ug.NewTools, DeepEquals, uploadedTools)
 			c.Check(ug.OldTools.Binary, Equals, version.Current)
 			c.Check(ug.DataDir, Equals, s.DataDir())
 			c.Check(ug.AgentName, Equals, "testagent")
 
 			// Check that the upgraded version was really downloaded.
-			path := agent.SharedToolsDir(s.DataDir(), tools.Binary)
+			path := tools.SharedToolsDir(s.DataDir(), uploadedTools.Binary)
 			data, err := ioutil.ReadFile(filepath.Join(path, "jujud"))
 			c.Check(err, IsNil)
-			c.Check(string(data), Equals, "jujud contents "+tools.Binary.String())
+			c.Check(string(data), Equals, "jujud contents "+uploadedTools.Binary.String())
 		}()
 	}
 }
@@ -277,13 +276,13 @@
 	currentTools := s.primeTools(c, version.MustParseBinary("2.0.2-foo-bar"))
 	ug := &UpgradeReadyError{
 		AgentName: "foo",
-		OldTools:  &state.Tools{Binary: version.MustParseBinary("2.0.0-foo-bar")},
+		OldTools:  &tools.Tools{Binary: version.MustParseBinary("2.0.0-foo-bar")},
 		NewTools:  currentTools,
 		DataDir:   s.DataDir(),
 	}
 	err := ug.ChangeAgentTools()
 	c.Assert(err, IsNil)
-	d := agent.ToolsDir(s.DataDir(), "foo")
+	d := tools.ToolsDir(s.DataDir(), "foo")
 	data, err := ioutil.ReadFile(filepath.Join(d, "jujud"))
 	c.Assert(err, IsNil)
 	c.Assert(string(data), Equals, "jujud contents 2.0.2-foo-bar")
@@ -311,8 +310,8 @@
 
 // startUpgrader starts the upgrader using the given machine,
 // expecting to see it set the given agent tools.
-func (s *UpgraderSuite) startUpgrader(c *C, expectTools *state.Tools) *Upgrader {
-	as := testAgentState(make(chan *state.Tools))
+func (s *UpgraderSuite) startUpgrader(c *C, expectTools *tools.Tools) *Upgrader {
+	as := testAgentState(make(chan *tools.Tools))
 	u := NewUpgrader(s.State, as, s.DataDir())
 	select {
 	case tools := <-as:
@@ -338,9 +337,9 @@
 	panic("unreachable")
 }
 
-type testAgentState chan *state.Tools
+type testAgentState chan *tools.Tools
 
-func (as testAgentState) SetAgentTools(tools *state.Tools) error {
+func (as testAgentState) SetAgentTools(tools *tools.Tools) error {
 	t := *tools
 	as <- &t
 	return nil

=== modified file 'container/lxc/lxc.go'
--- container/lxc/lxc.go	2013-07-01 01:09:16 +0000
+++ container/lxc/lxc.go	2013-07-09 05:06:28 +0000
@@ -11,6 +11,8 @@
 	"strings"
 
 	"launchpad.net/golxc"
+	"launchpad.net/loggo"
+
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/cloudinit"
@@ -18,7 +20,7 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
-	"launchpad.net/loggo"
+	"launchpad.net/juju-core/tools"
 )
 
 var logger = loggo.GetLogger("juju.container.lxc")
@@ -38,7 +40,7 @@
 	// StartContainer creates and starts a new lxc container for the specified machine.
 	StartContainer(
 		machineId, series, nonce string,
-		tools *state.Tools,
+		tools *tools.Tools,
 		environConfig *config.Config,
 		stateInfo *state.Info,
 		apiInfo *api.Info) (instance.Instance, error)
@@ -62,7 +64,7 @@
 
 func (manager *containerManager) StartContainer(
 	machineId, series, nonce string,
-	tools *state.Tools,
+	tools *tools.Tools,
 	environConfig *config.Config,
 	stateInfo *state.Info,
 	apiInfo *api.Info) (instance.Instance, error) {
@@ -214,7 +216,7 @@
 
 func writeUserData(
 	directory, machineId, nonce string,
-	tools *state.Tools,
+	tools *tools.Tools,
 	environConfig *config.Config,
 	stateInfo *state.Info,
 	apiInfo *api.Info,
@@ -234,7 +236,7 @@
 
 func cloudInitUserData(
 	machineId, nonce string,
-	tools *state.Tools,
+	tools *tools.Tools,
 	environConfig *config.Config,
 	stateInfo *state.Info,
 	apiInfo *api.Info,

=== modified file 'container/lxc/lxc_test.go'
--- container/lxc/lxc_test.go	2013-06-27 04:48:10 +0000
+++ container/lxc/lxc_test.go	2013-07-09 05:06:28 +0000
@@ -15,9 +15,9 @@
 	"launchpad.net/juju-core/container/lxc"
 	"launchpad.net/juju-core/instance"
 	jujutesting "launchpad.net/juju-core/juju/testing"
-	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing"
 	. "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
@@ -59,7 +59,7 @@
 
 	series := "series"
 	nonce := "fake-nonce"
-	tools := &state.Tools{
+	tools := &tools.Tools{
 		Binary: version.MustParseBinary("2.3.4-foo-bar"),
 		URL:    "http://tools.example.com/2.3.4-foo-bar.tgz",
 	}

=== modified file 'environs/agent/agent.go'
--- environs/agent/agent.go	2013-07-04 14:33:27 +0000
+++ environs/agent/agent.go	2013-07-09 05:06:28 +0000
@@ -11,6 +11,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"os"
 	"path"
@@ -58,7 +59,7 @@
 // ReadConf reads configuration data for the given
 // entity from the given data directory.
 func ReadConf(dataDir, tag string) (*Conf, error) {
-	dir := Dir(dataDir, tag)
+	dir := tools.Dir(dataDir, tag)
 	data, err := ioutil.ReadFile(path.Join(dir, "agent.conf"))
 	if err != nil {
 		return nil, err
@@ -104,7 +105,7 @@
 
 // Dir returns the agent's directory.
 func (c *Conf) Dir() string {
-	return Dir(c.DataDir, c.Tag())
+	return tools.Dir(c.DataDir, c.Tag())
 }
 
 // Check checks that the configuration has all the required elements.

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2013-07-08 22:22:36 +0000
+++ environs/cloudinit/cloudinit.go	2013-07-09 05:06:28 +0000
@@ -18,6 +18,7 @@
 	"launchpad.net/juju-core/log/syslog"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/upstart"
 	"launchpad.net/juju-core/utils"
 )
@@ -63,7 +64,7 @@
 	MachineNonce string
 
 	// Tools is juju tools to be used on the new machine.
-	Tools *state.Tools
+	Tools *tools.Tools
 
 	// DataDir holds the directory that juju state will be put in the new
 	// machine.
@@ -272,7 +273,7 @@
 	// Make the agent run via a symbolic link to the actual tools
 	// directory, so it can upgrade itself without needing to change
 	// the upstart script.
-	toolsDir := agent.ToolsDir(cfg.DataDir, tag)
+	toolsDir := tools.ToolsDir(cfg.DataDir, tag)
 	// TODO(dfc) ln -nfs, so it doesn't fail if for some reason that the target already exists
 	addScripts(c, fmt.Sprintf("ln -s %v %s", cfg.Tools.Binary, shquote(toolsDir)))
 
@@ -315,7 +316,7 @@
 }
 
 func (cfg *MachineConfig) jujuTools() string {
-	return agent.SharedToolsDir(cfg.DataDir, cfg.Tools.Binary)
+	return tools.SharedToolsDir(cfg.DataDir, cfg.Tools.Binary)
 }
 
 func (cfg *MachineConfig) stateHostAddrs() []string {

=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2013-07-08 22:33:40 +0000
+++ environs/cloudinit/cloudinit_test.go	2013-07-09 05:06:28 +0000
@@ -14,6 +14,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"regexp"
 	"strings"
@@ -241,8 +242,8 @@
 	},
 }
 
-func newSimpleTools(vers string) *state.Tools {
-	return &state.Tools{
+func newSimpleTools(vers string) *tools.Tools {
+	return &tools.Tools{
 		URL:    "http://foo.com/tools/juju" + vers + ".tgz",
 		Binary: version.MustParseBinary(vers),
 	}
@@ -494,7 +495,7 @@
 		cfg.Tools = nil
 	}},
 	{"missing tools URL", func(cfg *cloudinit.MachineConfig) {
-		cfg.Tools = &state.Tools{}
+		cfg.Tools = &tools.Tools{}
 	}},
 	{"entity tag must match started machine", func(cfg *cloudinit.MachineConfig) {
 		cfg.StateServer = false

=== modified file 'environs/ec2/ec2.go'
--- environs/ec2/ec2.go	2013-07-03 22:20:05 +0000
+++ environs/ec2/ec2.go	2013-07-09 05:06:28 +0000
@@ -15,11 +15,11 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"net/http"
 	"strings"
@@ -302,7 +302,7 @@
 	})
 }
 
-func (e *environ) userData(scfg *startInstanceParams, tools *state.Tools) ([]byte, error) {
+func (e *environ) userData(scfg *startInstanceParams, tools *tools.Tools) ([]byte, error) {
 	mcfg := &cloudinit.MachineConfig{
 		MachineId:    scfg.machineId,
 		MachineNonce: scfg.machineNonce,

=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go	2013-07-05 08:03:59 +0000
+++ environs/jujutest/livetests.go	2013-07-09 05:06:28 +0000
@@ -13,7 +13,6 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
@@ -23,6 +22,7 @@
 	statetesting "launchpad.net/juju-core/state/testing"
 	coretesting "launchpad.net/juju-core/testing"
 	. "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 	"time"
@@ -475,7 +475,7 @@
 
 type tooler interface {
 	Life() state.Life
-	AgentTools() (*state.Tools, error)
+	AgentTools() (*tools.Tools, error)
 	Refresh() error
 	String() string
 }
@@ -486,7 +486,7 @@
 }
 
 type toolsWaiter struct {
-	lastTools *state.Tools
+	lastTools *tools.Tools
 	// changes is a chan of struct{} so that it can
 	// be used with different kinds of entity watcher.
 	changes chan struct{}
@@ -532,7 +532,7 @@
 
 // NextTools returns the next changed tools, waiting
 // until the tools are actually set.
-func (w *toolsWaiter) NextTools(c *C) (*state.Tools, error) {
+func (w *toolsWaiter) NextTools(c *C) (*tools.Tools, error) {
 	for _ = range w.changes {
 		err := w.tooler.Refresh()
 		if err != nil {
@@ -561,7 +561,7 @@
 
 // waitAgentTools waits for the given agent
 // to start and returns the tools that it is running.
-func waitAgentTools(c *C, w *toolsWaiter, expect version.Binary) *state.Tools {
+func waitAgentTools(c *C, w *toolsWaiter, expect version.Binary) *tools.Tools {
 	c.Logf("waiting for %v to signal agent version", w.tooler.String())
 	tools, err := w.NextTools(c)
 	c.Assert(err, IsNil)

=== modified file 'environs/maas/environ.go'
--- environs/maas/environ.go	2013-07-03 22:20:05 +0000
+++ environs/maas/environ.go	2013-07-09 05:06:28 +0000
@@ -11,11 +11,11 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/cloudinit"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"net/url"
 	"sync"
@@ -216,7 +216,7 @@
 }
 
 // acquireNode allocates a node from the MAAS.
-func (environ *maasEnviron) acquireNode(cons constraints.Value, possibleTools tools.List) (gomaasapi.MAASObject, *state.Tools, error) {
+func (environ *maasEnviron) acquireNode(cons constraints.Value, possibleTools tools.List) (gomaasapi.MAASObject, *tools.Tools, error) {
 	retry := utils.AttemptStrategy{
 		Total: 5 * time.Second,
 		Delay: 200 * time.Millisecond,

=== modified file 'environs/maas/environ_test.go'
--- environs/maas/environ_test.go	2013-07-03 22:07:00 +0000
+++ environs/maas/environ_test.go	2013-07-09 05:06:28 +0000
@@ -13,10 +13,10 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 	"net/url"

=== modified file 'environs/maas/util_test.go'
--- environs/maas/util_test.go	2013-06-16 23:07:00 +0000
+++ environs/maas/util_test.go	2013-07-09 05:06:28 +0000
@@ -13,6 +13,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 )
@@ -42,7 +43,7 @@
 func (s *UtilSuite) TestUserData(c *C) {
 	testJujuHome := c.MkDir()
 	defer config.SetJujuHome(config.SetJujuHome(testJujuHome))
-	tools := &state.Tools{
+	tools := &tools.Tools{
 		URL:    "http://foo.com/tools/juju1.2.3-linux-amd64.tgz",
 		Binary: version.MustParseBinary("1.2.3-linux-amd64"),
 	}

=== modified file 'environs/openstack/export_test.go'
--- environs/openstack/export_test.go	2013-07-03 22:02:21 +0000
+++ environs/openstack/export_test.go	2013-07-09 05:06:28 +0000
@@ -14,7 +14,7 @@
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
 	"launchpad.net/juju-core/environs/jujutest"
-	"launchpad.net/juju-core/environs/tools"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"net/http"
 	"strings"

=== modified file 'environs/openstack/provider.go'
--- environs/openstack/provider.go	2013-07-03 22:20:05 +0000
+++ environs/openstack/provider.go	2013-07-09 05:06:28 +0000
@@ -21,11 +21,11 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"net/http"
 	"strconv"
@@ -629,7 +629,7 @@
 	withPublicIP bool
 }
 
-func (e *environ) userData(scfg *startInstanceParams, tools *state.Tools) ([]byte, error) {
+func (e *environ) userData(scfg *startInstanceParams, tools *tools.Tools) ([]byte, error) {
 	mcfg := &cloudinit.MachineConfig{
 		MachineId:    scfg.machineId,
 		MachineNonce: scfg.machineNonce,

=== modified file 'environs/testing/storage.go'
--- environs/testing/storage.go	2013-07-02 21:20:53 +0000
+++ environs/testing/storage.go	2013-07-09 05:06:28 +0000
@@ -18,7 +18,7 @@
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/localstorage"
-	"launchpad.net/juju-core/environs/tools"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 

=== modified file 'environs/testing/tools.go'
--- environs/testing/tools.go	2013-05-02 15:55:42 +0000
+++ environs/testing/tools.go	2013-07-09 05:06:28 +0000
@@ -7,14 +7,13 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/state"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"strings"
 )
 
-func uploadFakeToolsVersion(storage environs.Storage, vers version.Binary) (*state.Tools, error) {
+func uploadFakeToolsVersion(storage environs.Storage, vers version.Binary) (*tools.Tools, error) {
 	data := vers.String()
 	name := tools.StorageName(vers)
 	log.Noticef("environs/testing: uploading FAKE tools %s", vers)
@@ -25,19 +24,19 @@
 	if err != nil {
 		return nil, err
 	}
-	return &state.Tools{Binary: vers, URL: url}, nil
+	return &tools.Tools{Binary: vers, URL: url}, nil
 }
 
 // UploadFakeToolsVersion puts fake tools in the supplied storage for the
 // supplied version.
-func UploadFakeToolsVersion(c *C, storage environs.Storage, vers version.Binary) *state.Tools {
+func UploadFakeToolsVersion(c *C, storage environs.Storage, vers version.Binary) *tools.Tools {
 	t, err := uploadFakeToolsVersion(storage, vers)
 	c.Assert(err, IsNil)
 	return t
 }
 
 // MustUploadFakeToolsVersion acts as UploadFakeToolsVersion, but panics on failure.
-func MustUploadFakeToolsVersion(storage environs.Storage, vers version.Binary) *state.Tools {
+func MustUploadFakeToolsVersion(storage environs.Storage, vers version.Binary) *tools.Tools {
 	t, err := uploadFakeToolsVersion(storage, vers)
 	if err != nil {
 		panic(err)

=== removed directory 'environs/tools'
=== modified file 'environs/tools.go'
--- environs/tools.go	2013-05-30 00:47:30 +0000
+++ environs/tools.go	2013-07-09 05:06:28 +0000
@@ -6,10 +6,9 @@
 import (
 	"fmt"
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/state"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
@@ -119,7 +118,7 @@
 // TODO(fwereade) this should not exist: it's used by cmd/jujud/Upgrader,
 // which needs to run on every agent and must absolutely *not* in general
 // have access to an Environ.
-func FindExactTools(environ Environ, vers version.Binary) (t *state.Tools, err error) {
+func FindExactTools(environ Environ, vers version.Binary) (t *tools.Tools, err error) {
 	defer convertToolsError(&err)
 	list, err := FindAvailableTools(environ, vers.Major)
 	if err != nil {

=== modified file 'environs/tools_test.go'
--- environs/tools_test.go	2013-05-30 00:47:30 +0000
+++ environs/tools_test.go	2013-07-09 05:06:28 +0000
@@ -9,9 +9,9 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/dummy"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 

=== modified file 'state/api/params/internal.go'
--- state/api/params/internal.go	2013-07-08 13:48:32 +0000
+++ state/api/params/internal.go	2013-07-09 05:06:28 +0000
@@ -57,7 +57,7 @@
 }
 
 // AgentTools describes the tools for a given Agent. This is mostly a flattened
-// state.Tools description, plus an agent Tag field.
+// tools.Tools description, plus an agent Tag field.
 type AgentTools struct {
 	Tag    string
 	Major  int

=== modified file 'state/api/upgrader/upgrader_test.go'
--- state/api/upgrader/upgrader_test.go	2013-07-04 14:33:27 +0000
+++ state/api/upgrader/upgrader_test.go	2013-07-09 05:06:28 +0000
@@ -17,6 +17,7 @@
 	"launchpad.net/juju-core/state/apiserver"
 	coretesting "launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
@@ -137,7 +138,7 @@
 
 func (s *upgraderSuite) TestTools(c *C) {
 	cur := version.Current
-	curTools := &state.Tools{Binary: cur, URL: ""}
+	curTools := &tools.Tools{Binary: cur, URL: ""}
 	if curTools.Minor > 0 {
 		curTools.Minor -= 1
 	}

=== modified file 'state/apiserver/upgrader/upgrader.go'
--- state/apiserver/upgrader/upgrader.go	2013-07-04 11:03:43 +0000
+++ state/apiserver/upgrader/upgrader.go	2013-07-09 05:06:28 +0000
@@ -8,6 +8,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/apiserver/common"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
@@ -129,30 +130,30 @@
 	results := params.SetAgentToolsResults{
 		Results: make([]params.SetAgentToolsResult, len(args.AgentTools)),
 	}
-	for i, tools := range args.AgentTools {
+	for i, agentTools := range args.AgentTools {
 		var err error
-		results.Results[i].Tag = tools.Tag
-		if !u.authorizer.AuthOwner(tools.Tag) {
+		results.Results[i].Tag = agentTools.Tag
+		if !u.authorizer.AuthOwner(agentTools.Tag) {
 			err = common.ErrPerm
 		} else {
 			// TODO: When we get there, we should support setting
 			//       Unit agent tools as well as Machine tools. We
 			//       can use something like the "AgentState"
 			//       interface that cmd/jujud/agent.go had.
-			machine, err := u.st.Machine(state.MachineIdFromTag(tools.Tag))
+			machine, err := u.st.Machine(state.MachineIdFromTag(agentTools.Tag))
 			if err == nil {
-				stTools := state.Tools{
+				stTools := tools.Tools{
 					Binary: version.Binary{
 						Number: version.Number{
-							Major: tools.Major,
-							Minor: tools.Minor,
-							Patch: tools.Patch,
-							Build: tools.Build,
+							Major: agentTools.Major,
+							Minor: agentTools.Minor,
+							Patch: agentTools.Patch,
+							Build: agentTools.Build,
 						},
-						Arch:   tools.Arch,
-						Series: tools.Series,
+						Arch:   agentTools.Arch,
+						Series: agentTools.Series,
 					},
-					URL: tools.URL,
+					URL: agentTools.URL,
 				}
 				err = machine.SetAgentTools(&stTools)
 			}

=== modified file 'state/apiserver/upgrader/upgrader_test.go'
--- state/apiserver/upgrader/upgrader_test.go	2013-07-08 11:36:10 +0000
+++ state/apiserver/upgrader/upgrader_test.go	2013-07-09 05:06:28 +0000
@@ -15,6 +15,7 @@
 	"launchpad.net/juju-core/state/apiserver/upgrader"
 	statetesting "launchpad.net/juju-core/state/testing"
 	"launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
@@ -149,7 +150,7 @@
 	// The machine must have its existing tools set before we query for the
 	// next tools. This is so that we can grab Arch and Series without
 	// having to pass it in again
-	err := s.rawMachine.SetAgentTools(&state.Tools{
+	err := s.rawMachine.SetAgentTools(&tools.Tools{
 		URL:    "",
 		Binary: version.Current,
 	})

=== modified file 'state/machine.go'
--- state/machine.go	2013-07-01 00:17:52 +0000
+++ state/machine.go	2013-07-09 05:06:28 +0000
@@ -12,6 +12,7 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/presence"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"strings"
 	"time"
@@ -58,8 +59,8 @@
 	ContainerType string
 	Principals    []string
 	Life          Life
-	Tools         *Tools `bson:",omitempty"`
-	TxnRevno      int64  `bson:"txn-revno"`
+	Tools         *tools.Tools `bson:",omitempty"`
+	TxnRevno      int64        `bson:"txn-revno"`
 	Jobs          []MachineJob
 	PasswordHash  string
 	Clean         bool
@@ -184,7 +185,7 @@
 
 // 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, error) {
+func (m *Machine) AgentTools() (*tools.Tools, error) {
 	if m.doc.Tools == nil {
 		return nil, errors.NotFoundf("agent tools for machine %v", m)
 	}
@@ -193,7 +194,7 @@
 }
 
 // SetAgentTools sets the tools that the agent is currently running.
-func (m *Machine) SetAgentTools(t *Tools) (err error) {
+func (m *Machine) SetAgentTools(t *tools.Tools) (err error) {
 	defer utils.ErrorContextf(&err, "cannot set agent tools for machine %v", m)
 	if t.Series == "" || t.Arch == "" {
 		return fmt.Errorf("empty series or arch")

=== modified file 'state/machine_test.go'
--- state/machine_test.go	2013-07-03 13:12:37 +0000
+++ state/machine_test.go	2013-07-09 05:06:28 +0000
@@ -12,6 +12,7 @@
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/testing"
 	"launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"sort"
 	"time"
@@ -421,7 +422,7 @@
 	oldTools, _ := m0.AgentTools()
 	m1, err := s.State.Machine(m0.Id())
 	c.Assert(err, IsNil)
-	err = m0.SetAgentTools(&state.Tools{
+	err = m0.SetAgentTools(&tools.Tools{
 		URL:    "foo",
 		Binary: version.MustParseBinary("0.0.3-series-arch"),
 	})
@@ -584,7 +585,7 @@
 	wc.AssertOneChange()
 
 	// Make two changes, check one event.
-	err = machine.SetAgentTools(&state.Tools{
+	err = machine.SetAgentTools(&tools.Tools{
 		URL:    "foo",
 		Binary: version.MustParseBinary("0.0.3-series-arch"),
 	})

=== modified file 'state/state.go'
--- state/state.go	2013-07-08 06:06:57 +0000
+++ state/state.go	2013-07-09 05:06:28 +0000
@@ -22,7 +22,6 @@
 	"launchpad.net/juju-core/state/presence"
 	"launchpad.net/juju-core/state/watcher"
 	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/version"
 	"net/url"
 	"regexp"
 	"sort"
@@ -34,38 +33,6 @@
 // TODO(niemeyer): This must not be exported.
 type D []bson.DocElem
 
-// Tools describes a particular set of juju tools and where to find them.
-type Tools struct {
-	version.Binary
-	URL string
-}
-
-type toolsDoc struct {
-	Version version.Binary
-	URL     string
-}
-
-func (t *Tools) GetBSON() (interface{}, error) {
-	if t == nil {
-		return nil, nil
-	}
-	return &toolsDoc{t.Binary, t.URL}, nil
-}
-
-func (t *Tools) SetBSON(raw bson.Raw) error {
-	if raw.Kind == 10 {
-		// Preserve the nil value in that case.
-		return bson.SetZero
-	}
-	var doc toolsDoc
-	if err := raw.Unmarshal(&doc); err != nil {
-		return err
-	}
-	t.Binary = doc.Version
-	t.URL = doc.URL
-	return nil
-}
-
 const serviceSnippet = "[a-z][a-z0-9]*(-[a-z0-9]*[a-z][a-z0-9]*)*"
 const numberSnippet = "(0|[1-9][0-9]*)"
 const containerSnippet = "(/[a-z]+/" + numberSnippet + ")"

=== modified file 'state/state_test.go'
--- state/state_test.go	2013-07-07 22:06:05 +0000
+++ state/state_test.go	2013-07-09 05:06:28 +0000
@@ -17,6 +17,7 @@
 	statetesting "launchpad.net/juju-core/state/testing"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"net/url"
 	"strconv"
@@ -964,7 +965,7 @@
 	wc.AssertOneChange()
 
 	// Alter the machine: not reported.
-	tools := &state.Tools{
+	tools := &tools.Tools{
 		Binary: version.Binary{
 			Number: version.MustParse("1.2.3"),
 			Series: "gutsy",

=== modified file 'state/tools_test.go'
--- state/tools_test.go	2013-06-25 09:50:52 +0000
+++ state/tools_test.go	2013-07-09 05:06:28 +0000
@@ -5,17 +5,17 @@
 
 import (
 	"fmt"
-	"labix.org/v2/mgo/bson"
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
 type tooler interface {
-	AgentTools() (*state.Tools, error)
-	SetAgentTools(t *state.Tools) error
+	AgentTools() (*tools.Tools, error)
+	SetAgentTools(t *tools.Tools) error
 	Life() state.Life
 	Refresh() error
 	Destroy() error
@@ -28,8 +28,8 @@
 	ConnSuite
 }
 
-func newTools(vers, url string) *state.Tools {
-	return &state.Tools{
+func newTools(vers, url string) *tools.Tools {
+	return &tools.Tools{
 		Binary: version.MustParseBinary(vers),
 		URL:    url,
 	}
@@ -41,7 +41,7 @@
 	c.Assert(t, IsNil)
 	c.Assert(err, checkers.Satisfies, errors.IsNotFoundError)
 
-	err = obj.SetAgentTools(&state.Tools{})
+	err = obj.SetAgentTools(&tools.Tools{})
 	c.Assert(err, ErrorMatches, fmt.Sprintf("cannot set agent tools for %s: empty series or arch", agent))
 	t2 := newTools("7.8.9-foo-bar", "http://arble.tgz")
 	err = obj.SetAgentTools(t2)
@@ -75,36 +75,3 @@
 	preventUnitDestroyRemove(c, unit)
 	testAgentTools(c, unit, `unit "wordpress/0"`)
 }
-
-func (s *ToolsSuite) TestMarshalUnmarshal(c *C) {
-	tools := newTools("7.8.9-foo-bar", "http://arble.tgz")
-	data, err := bson.Marshal(&tools)
-	c.Assert(err, IsNil)
-
-	// Check the exact document.
-	want := bson.M{
-		"version": tools.Binary.String(),
-		"url":     tools.URL,
-	}
-	got := bson.M{}
-	err = bson.Unmarshal(data, &got)
-	c.Assert(err, IsNil)
-	c.Assert(got, DeepEquals, want)
-
-	// Check that it unpacks properly too.
-	var t state.Tools
-	err = bson.Unmarshal(data, &t)
-	c.Assert(err, IsNil)
-	c.Assert(t, Equals, *tools)
-}
-
-func (s *ToolsSuite) TestUnmarshalNilRoundtrip(c *C) {
-	// We have a custom unmarshaller that should keep
-	// the field unset when it finds a nil value.
-	var v struct{ Tools *state.Tools }
-	data, err := bson.Marshal(&v)
-	c.Assert(err, IsNil)
-	err = bson.Unmarshal(data, &v)
-	c.Assert(err, IsNil)
-	c.Assert(v.Tools, IsNil)
-}

=== modified file 'state/unit.go'
--- state/unit.go	2013-07-08 02:42:00 +0000
+++ state/unit.go	2013-07-09 05:06:28 +0000
@@ -14,6 +14,7 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/presence"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"sort"
 	"strings"
@@ -73,7 +74,7 @@
 	PrivateAddress string
 	MachineId      string
 	Resolved       ResolvedMode
-	Tools          *Tools `bson:",omitempty"`
+	Tools          *tools.Tools `bson:",omitempty"`
 	Ports          []instance.Port
 	Life           Life
 	TxnRevno       int64 `bson:"txn-revno"`
@@ -160,7 +161,7 @@
 
 // AgentTools returns the tools that the agent is currently running.
 // It an error that satisfies IsNotFound if the tools have not yet been set.
-func (u *Unit) AgentTools() (*Tools, error) {
+func (u *Unit) AgentTools() (*tools.Tools, error) {
 	if u.doc.Tools == nil {
 		return nil, errors.NotFoundf("agent tools for unit %q", u)
 	}
@@ -169,7 +170,7 @@
 }
 
 // SetAgentTools sets the tools that the agent is currently running.
-func (u *Unit) SetAgentTools(t *Tools) (err error) {
+func (u *Unit) SetAgentTools(t *tools.Tools) (err error) {
 	defer utils.ErrorContextf(&err, "cannot set agent tools for unit %q", u)
 	if t.Series == "" || t.Arch == "" {
 		return fmt.Errorf("empty series or arch")

=== renamed file 'environs/agent/tools.go' => 'tools/agent.go'
--- environs/agent/tools.go	2013-05-02 15:55:42 +0000
+++ tools/agent.go	2013-07-09 05:06:28 +0000
@@ -1,7 +1,7 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package agent
+package tools
 
 import (
 	"archive/tar"
@@ -9,12 +9,12 @@
 	"fmt"
 	"io"
 	"io/ioutil"
-	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/version"
 	"os"
 	"path"
 	"strings"
+
+	"launchpad.net/juju-core/log"
+	"launchpad.net/juju-core/version"
 )
 
 const urlFile = "downloaded-url.txt"
@@ -42,7 +42,7 @@
 // format and unpacks them into the appropriate tools directory
 // within dataDir. If a valid tools directory already exists,
 // UnpackTools returns without error.
-func UnpackTools(dataDir string, tools *state.Tools, r io.Reader) (err error) {
+func UnpackTools(dataDir string, tools *Tools, r io.Reader) (err error) {
 	zr, err := gzip.NewReader(r)
 	if err != nil {
 		return err
@@ -119,7 +119,7 @@
 
 // ReadTools checks that the tools for the given version exist
 // in the dataDir directory, and returns a Tools instance describing them.
-func ReadTools(dataDir string, vers version.Binary) (*state.Tools, error) {
+func ReadTools(dataDir string, vers version.Binary) (*Tools, error) {
 	dir := SharedToolsDir(dataDir, vers)
 	urlData, err := ioutil.ReadFile(path.Join(dir, urlFile))
 	if err != nil {
@@ -131,7 +131,7 @@
 	}
 	// TODO(rog): do more verification here too, such as checking
 	// for the existence of certain files.
-	return &state.Tools{
+	return &Tools{
 		URL:    url,
 		Binary: vers,
 	}, nil
@@ -140,7 +140,7 @@
 // ChangeAgentTools atomically replaces the agent-specific symlink
 // under dataDir so it points to the previously unpacked
 // version vers. It returns the new tools read.
-func ChangeAgentTools(dataDir string, agentName string, vers version.Binary) (*state.Tools, error) {
+func ChangeAgentTools(dataDir string, agentName string, vers version.Binary) (*Tools, error) {
 	tools, err := ReadTools(dataDir, vers)
 	if err != nil {
 		return nil, err

=== renamed file 'environs/agent/tools_test.go' => 'tools/agent_test.go'
--- environs/agent/tools_test.go	2013-05-02 15:55:42 +0000
+++ tools/agent_test.go	2013-07-09 05:06:28 +0000
@@ -1,19 +1,20 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package agent_test
+package tools_test
 
 import (
 	"bytes"
 	"io/ioutil"
+	"os"
+	"path/filepath"
+	"sort"
+
 	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/environs/agent"
-	"launchpad.net/juju-core/state"
+
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
-	"os"
-	"path/filepath"
-	"sort"
 )
 
 type ToolsSuite struct {
@@ -69,11 +70,11 @@
 func (t *ToolsSuite) TestUnpackToolsBadData(c *C) {
 	for i, test := range unpackToolsBadDataTests {
 		c.Logf("test %d", i)
-		tools := &state.Tools{
+		testTools := &tools.Tools{
 			URL:    "http://foo/bar",
 			Binary: version.MustParseBinary("1.2.3-foo-bar"),
 		}
-		err := agent.UnpackTools(t.dataDir, tools, bytes.NewReader(test.data))
+		err := tools.UnpackTools(t.dataDir, testTools, bytes.NewReader(test.data))
 		c.Assert(err, ErrorMatches, test.err)
 		assertDirNames(c, t.toolsDir(), []string{})
 	}
@@ -88,19 +89,19 @@
 		testing.NewTarFile("bar", 0755, "bar contents"),
 		testing.NewTarFile("foo", 0755, "foo contents"),
 	}
-	tools := &state.Tools{
+	testTools := &tools.Tools{
 		URL:    "http://foo/bar",
 		Binary: version.MustParseBinary("1.2.3-foo-bar"),
 	}
 
-	err := agent.UnpackTools(t.dataDir, tools, bytes.NewReader(testing.TarGz(files...)))
+	err := tools.UnpackTools(t.dataDir, testTools, bytes.NewReader(testing.TarGz(files...)))
 	c.Assert(err, IsNil)
 	assertDirNames(c, t.toolsDir(), []string{"1.2.3-foo-bar"})
-	t.assertToolsContents(c, tools, files)
+	t.assertToolsContents(c, testTools, files)
 
 	// Try to unpack the same version of tools again - it should succeed,
 	// leaving the original version around.
-	tools2 := &state.Tools{
+	tools2 := &tools.Tools{
 		URL:    "http://arble",
 		Binary: version.MustParseBinary("1.2.3-foo-bar"),
 	}
@@ -108,27 +109,27 @@
 		testing.NewTarFile("bar", 0755, "bar2 contents"),
 		testing.NewTarFile("x", 0755, "x contents"),
 	}
-	err = agent.UnpackTools(t.dataDir, tools2, bytes.NewReader(testing.TarGz(files2...)))
+	err = tools.UnpackTools(t.dataDir, tools2, bytes.NewReader(testing.TarGz(files2...)))
 	c.Assert(err, IsNil)
 	assertDirNames(c, t.toolsDir(), []string{"1.2.3-foo-bar"})
-	t.assertToolsContents(c, tools, files)
+	t.assertToolsContents(c, testTools, files)
 }
 
 func (t *ToolsSuite) TestReadToolsErrors(c *C) {
 	vers := version.MustParseBinary("1.2.3-precise-amd64")
-	tools, err := agent.ReadTools(t.dataDir, vers)
-	c.Assert(tools, IsNil)
+	testTools, err := tools.ReadTools(t.dataDir, vers)
+	c.Assert(testTools, IsNil)
 	c.Assert(err, ErrorMatches, "cannot read URL in tools directory: .*")
 
-	dir := agent.SharedToolsDir(t.dataDir, vers)
+	dir := tools.SharedToolsDir(t.dataDir, vers)
 	err = os.MkdirAll(dir, 0755)
 	c.Assert(err, IsNil)
 
 	err = ioutil.WriteFile(filepath.Join(dir, urlFile), []byte(" \t\n"), 0644)
 	c.Assert(err, IsNil)
 
-	tools, err = agent.ReadTools(t.dataDir, vers)
-	c.Assert(tools, IsNil)
+	testTools, err = tools.ReadTools(t.dataDir, vers)
+	c.Assert(testTools, IsNil)
 	c.Assert(err, ErrorMatches, "empty URL in tools directory.*")
 }
 
@@ -137,62 +138,62 @@
 		testing.NewTarFile("jujuc", 0755, "juju executable"),
 		testing.NewTarFile("jujud", 0755, "jujuc executable"),
 	}
-	tools := &state.Tools{
+	testTools := &tools.Tools{
 		URL:    "http://foo/bar1",
 		Binary: version.MustParseBinary("1.2.3-foo-bar"),
 	}
-	err := agent.UnpackTools(t.dataDir, tools, bytes.NewReader(testing.TarGz(files...)))
+	err := tools.UnpackTools(t.dataDir, testTools, bytes.NewReader(testing.TarGz(files...)))
 	c.Assert(err, IsNil)
 
-	gotTools, err := agent.ChangeAgentTools(t.dataDir, "testagent", tools.Binary)
+	gotTools, err := tools.ChangeAgentTools(t.dataDir, "testagent", testTools.Binary)
 	c.Assert(err, IsNil)
-	c.Assert(*gotTools, Equals, *tools)
+	c.Assert(*gotTools, Equals, *testTools)
 
 	assertDirNames(c, t.toolsDir(), []string{"1.2.3-foo-bar", "testagent"})
-	assertDirNames(c, agent.ToolsDir(t.dataDir, "testagent"), []string{"jujuc", "jujud", urlFile})
+	assertDirNames(c, tools.ToolsDir(t.dataDir, "testagent"), []string{"jujuc", "jujud", urlFile})
 
 	// Upgrade again to check that the link replacement logic works ok.
 	files2 := []*testing.TarFile{
 		testing.NewTarFile("foo", 0755, "foo content"),
 		testing.NewTarFile("bar", 0755, "bar content"),
 	}
-	tools2 := &state.Tools{
+	tools2 := &tools.Tools{
 		URL:    "http://foo/bar2",
 		Binary: version.MustParseBinary("1.2.4-foo-bar"),
 	}
-	err = agent.UnpackTools(t.dataDir, tools2, bytes.NewReader(testing.TarGz(files2...)))
+	err = tools.UnpackTools(t.dataDir, tools2, bytes.NewReader(testing.TarGz(files2...)))
 	c.Assert(err, IsNil)
 
-	gotTools, err = agent.ChangeAgentTools(t.dataDir, "testagent", tools2.Binary)
+	gotTools, err = tools.ChangeAgentTools(t.dataDir, "testagent", tools2.Binary)
 	c.Assert(err, IsNil)
 	c.Assert(*gotTools, Equals, *tools2)
 
 	assertDirNames(c, t.toolsDir(), []string{"1.2.3-foo-bar", "1.2.4-foo-bar", "testagent"})
-	assertDirNames(c, agent.ToolsDir(t.dataDir, "testagent"), []string{"foo", "bar", urlFile})
+	assertDirNames(c, tools.ToolsDir(t.dataDir, "testagent"), []string{"foo", "bar", urlFile})
 }
 
 func (t *ToolsSuite) TestSharedToolsDir(c *C) {
-	dir := agent.SharedToolsDir("/var/lib/juju", version.MustParseBinary("1.2.3-precise-amd64"))
+	dir := tools.SharedToolsDir("/var/lib/juju", version.MustParseBinary("1.2.3-precise-amd64"))
 	c.Assert(dir, Equals, "/var/lib/juju/tools/1.2.3-precise-amd64")
 }
 
 // assertToolsContents asserts that the directory for the tools
 // has the given contents.
-func (t *ToolsSuite) assertToolsContents(c *C, tools *state.Tools, files []*testing.TarFile) {
+func (t *ToolsSuite) assertToolsContents(c *C, testTools *tools.Tools, files []*testing.TarFile) {
 	var wantNames []string
 	for _, f := range files {
 		wantNames = append(wantNames, f.Header.Name)
 	}
 	wantNames = append(wantNames, urlFile)
-	dir := agent.SharedToolsDir(t.dataDir, tools.Binary)
+	dir := tools.SharedToolsDir(t.dataDir, testTools.Binary)
 	assertDirNames(c, dir, wantNames)
-	assertFileContents(c, dir, urlFile, tools.URL, 0200)
+	assertFileContents(c, dir, urlFile, testTools.URL, 0200)
 	for _, f := range files {
 		assertFileContents(c, dir, f.Header.Name, f.Contents, 0400)
 	}
-	gotTools, err := agent.ReadTools(t.dataDir, tools.Binary)
+	gotTools, err := tools.ReadTools(t.dataDir, testTools.Binary)
 	c.Assert(err, IsNil)
-	c.Assert(*gotTools, Equals, *tools)
+	c.Assert(*gotTools, Equals, *testTools)
 }
 
 // assertFileContents asserts that the given file in the

=== renamed file 'environs/tools/build.go' => 'tools/build.go'
--- environs/tools/build.go	2013-05-02 15:55:42 +0000
+++ tools/build.go	2013-07-09 05:06:28 +0000
@@ -9,11 +9,12 @@
 	"fmt"
 	"io"
 	"io/ioutil"
-	"launchpad.net/juju-core/version"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
+
+	"launchpad.net/juju-core/version"
 )
 
 // archive writes the executable files found in the given directory in

=== modified file 'tools/diskmanager.go'
--- tools/diskmanager.go	2013-07-08 04:52:30 +0000
+++ tools/diskmanager.go	2013-07-09 05:06:28 +0000
@@ -6,8 +6,6 @@
 import (
 	"io"
 
-	"launchpad.net/juju-core/environs/agent"
-	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/version"
 )
 
@@ -23,18 +21,14 @@
 	return &DiskManager{dataDir: dataDir}
 }
 
-// For now, everything is just proxied from environs/agent. But really tool
-// handling should be independent of anything in environs.
-
 func (d *DiskManager) ReadTools(vers version.Binary) (*Tools, error) {
-	stTools, err := agent.ReadTools(d.dataDir, vers)
-	return (*Tools)(stTools), err
+	return ReadTools(d.dataDir, vers)
 }
 
 func (d *DiskManager) UnpackTools(tools *Tools, r io.Reader) error {
-	return agent.UnpackTools(d.dataDir, (*state.Tools)(tools), r)
+	return UnpackTools(d.dataDir, tools, r)
 }
 
 func (d *DiskManager) SharedToolsDir(vers version.Binary) string {
-	return agent.SharedToolsDir(d.dataDir, vers)
+	return SharedToolsDir(d.dataDir, vers)
 }

=== modified file 'tools/diskmanager_test.go'
--- tools/diskmanager_test.go	2013-07-08 09:19:16 +0000
+++ tools/diskmanager_test.go	2013-07-09 05:06:28 +0000
@@ -5,10 +5,7 @@
 
 import (
 	"bytes"
-	"io/ioutil"
-	"os"
 	"path/filepath"
-	"sort"
 
 	gc "launchpad.net/gocheck"
 
@@ -76,8 +73,6 @@
 	c.Assert(dir, gc.Equals, "/var/lib/juju/tools/1.2.3-precise-amd64")
 }
 
-const urlFile = "downloaded-url.txt"
-
 // assertToolsContents asserts that the directory for the tools
 // has the given contents.
 func (s *DiskManagerSuite) assertToolsContents(c *gc.C, t *tools.Tools, files []*coretesting.TarFile) {
@@ -96,28 +91,3 @@
 	c.Assert(err, gc.IsNil)
 	c.Assert(*gotTools, gc.Equals, *t)
 }
-
-// assertFileContents asserts that the given file in the
-// given directory has the given contents.
-func assertFileContents(c *gc.C, dir, file, contents string, mode os.FileMode) {
-	file = filepath.Join(dir, file)
-	info, err := os.Stat(file)
-	c.Assert(err, gc.IsNil)
-	c.Assert(info.Mode()&(os.ModeType|mode), gc.Equals, mode)
-	data, err := ioutil.ReadFile(file)
-	c.Assert(err, gc.IsNil)
-	c.Assert(string(data), gc.Equals, contents)
-}
-
-// assertDirNames asserts that the given directory
-// holds the given file or directory names.
-func assertDirNames(c *gc.C, dir string, names []string) {
-	f, err := os.Open(dir)
-	c.Assert(err, gc.IsNil)
-	defer f.Close()
-	dnames, err := f.Readdirnames(0)
-	c.Assert(err, gc.IsNil)
-	sort.Strings(dnames)
-	sort.Strings(names)
-	c.Assert(dnames, gc.DeepEquals, names)
-}

=== renamed file 'environs/tools/export_test.go' => 'tools/export_test.go'
=== renamed file 'environs/tools/list.go' => 'tools/list.go'
--- environs/tools/list.go	2013-05-02 15:55:42 +0000
+++ tools/list.go	2013-07-09 05:06:28 +0000
@@ -4,16 +4,16 @@
 package tools
 
 import (
+	"strings"
+
 	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/utils/set"
 	"launchpad.net/juju-core/version"
-	"strings"
 )
 
 // List holds tools available in an environment. The order of tools within
 // a List is not significant.
-type List []*state.Tools
+type List []*Tools
 
 // String returns the versions of the tools in src, separated by semicolons.
 func (src List) String() string {
@@ -26,21 +26,21 @@
 
 // Series returns all series for which some tools in src were built.
 func (src List) Series() []string {
-	return src.collect(func(tools *state.Tools) string {
+	return src.collect(func(tools *Tools) string {
 		return tools.Series
 	})
 }
 
 // Arches returns all architectures for which some tools in src were built.
 func (src List) Arches() []string {
-	return src.collect(func(tools *state.Tools) string {
+	return src.collect(func(tools *Tools) string {
 		return tools.Arch
 	})
 }
 
 // collect calls f on all values in src and returns an alphabetically
 // ordered list of the returned results without duplicates.
-func (src List) collect(f func(*state.Tools) string) []string {
+func (src List) collect(f func(*Tools) string) []string {
 	var seen set.Strings
 	for _, tools := range src {
 		seen.Add(f(tools))
@@ -125,7 +125,7 @@
 }
 
 // match returns true if the supplied tools match f.
-func (f Filter) match(tools *state.Tools) bool {
+func (f Filter) match(tools *Tools) bool {
 	if f.Released && tools.IsDev() {
 		return false
 	}

=== renamed file 'environs/tools/list_test.go' => 'tools/list_test.go'
--- environs/tools/list_test.go	2013-05-02 15:55:42 +0000
+++ tools/list_test.go	2013-07-09 05:06:28 +0000
@@ -5,22 +5,19 @@
 
 import (
 	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/state"
+	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
-	"testing"
 )
 
-func TestPackage(t *testing.T) {
-	TestingT(t)
+type ListSuite struct {
+	testing.LoggingSuite
 }
 
-type ListSuite struct{}
-
 var _ = Suite(&ListSuite{})
 
-func mustParseTools(name string) *state.Tools {
-	return &state.Tools{
+func mustParseTools(name string) *tools.Tools {
+	return &tools.Tools{
 		Binary: version.MustParseBinary(name),
 		URL:    "http://example.com/" + name,
 	}

=== added file 'tools/marshal.go'
--- tools/marshal.go	1970-01-01 00:00:00 +0000
+++ tools/marshal.go	2013-07-09 05:06:28 +0000
@@ -0,0 +1,36 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package tools
+
+import (
+	"labix.org/v2/mgo/bson"
+
+	"launchpad.net/juju-core/version"
+)
+
+type toolsDoc struct {
+	Version version.Binary
+	URL     string
+}
+
+func (t *Tools) GetBSON() (interface{}, error) {
+	if t == nil {
+		return nil, nil
+	}
+	return &toolsDoc{t.Binary, t.URL}, nil
+}
+
+func (t *Tools) SetBSON(raw bson.Raw) error {
+	if raw.Kind == 10 {
+		// Preserve the nil value in that case.
+		return bson.SetZero
+	}
+	var doc toolsDoc
+	if err := raw.Unmarshal(&doc); err != nil {
+		return err
+	}
+	t.Binary = doc.Version
+	t.URL = doc.URL
+	return nil
+}

=== added file 'tools/marshal_test.go'
--- tools/marshal_test.go	1970-01-01 00:00:00 +0000
+++ tools/marshal_test.go	2013-07-09 05:06:28 +0000
@@ -0,0 +1,57 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package tools_test
+
+import (
+	"labix.org/v2/mgo/bson"
+	. "launchpad.net/gocheck"
+
+	"launchpad.net/juju-core/tools"
+	"launchpad.net/juju-core/version"
+)
+
+var _ = Suite(&marshalSuite{})
+
+type marshalSuite struct {
+}
+
+func newTools(vers, url string) *tools.Tools {
+	return &tools.Tools{
+		Binary: version.MustParseBinary(vers),
+		URL:    url,
+	}
+}
+
+func (s *marshalSuite) TestMarshalUnmarshal(c *C) {
+	testTools := newTools("7.8.9-foo-bar", "http://arble.tgz")
+	data, err := bson.Marshal(&testTools)
+	c.Assert(err, IsNil)
+
+	// Check the exact document.
+	want := bson.M{
+		"version": testTools.Binary.String(),
+		"url":     testTools.URL,
+	}
+	got := bson.M{}
+	err = bson.Unmarshal(data, &got)
+	c.Assert(err, IsNil)
+	c.Assert(got, DeepEquals, want)
+
+	// Check that it unpacks properly too.
+	var t tools.Tools
+	err = bson.Unmarshal(data, &t)
+	c.Assert(err, IsNil)
+	c.Assert(t, Equals, *testTools)
+}
+
+func (s *marshalSuite) TestUnmarshalNilRoundtrip(c *C) {
+	// We have a custom unmarshaller that should keep
+	// the field unset when it finds a nil value.
+	var v struct{ Tools *tools.Tools }
+	data, err := bson.Marshal(&v)
+	c.Assert(err, IsNil)
+	err = bson.Unmarshal(data, &v)
+	c.Assert(err, IsNil)
+	c.Assert(v.Tools, IsNil)
+}

=== renamed file 'environs/tools/storage.go' => 'tools/storage.go'
--- environs/tools/storage.go	2013-05-02 15:55:42 +0000
+++ tools/storage.go	2013-07-09 05:06:28 +0000
@@ -8,11 +8,11 @@
 	"fmt"
 	"io"
 	"io/ioutil"
+	"os"
+	"strings"
+
 	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/version"
-	"os"
-	"strings"
 )
 
 var ErrNoTools = errors.New("no tools available")
@@ -57,7 +57,7 @@
 		if !strings.HasPrefix(name, toolPrefix) || !strings.HasSuffix(name, toolSuffix) {
 			continue
 		}
-		var t state.Tools
+		var t Tools
 		vers := name[len(toolPrefix) : len(name)-len(toolSuffix)]
 		if t.Binary, err = version.ParseBinary(vers); err != nil {
 			continue
@@ -95,7 +95,7 @@
 // of the built tools will be uploaded for use by machines of those series.
 // Juju tools built for one series do not necessarily run on another, but this
 // func exists only for development use cases.
-func Upload(storage URLPutter, forceVersion *version.Number, fakeSeries ...string) (*state.Tools, error) {
+func Upload(storage URLPutter, forceVersion *version.Number, fakeSeries ...string) (*Tools, error) {
 	// TODO(rog) find binaries from $PATH when not using a development
 	// version of juju within a $GOPATH.
 
@@ -146,5 +146,5 @@
 	if err != nil {
 		return nil, err
 	}
-	return &state.Tools{toolsVersion, url}, nil
+	return &Tools{toolsVersion, url}, nil
 }

=== renamed file 'environs/tools/storage_test.go' => 'tools/storage_test.go'
--- environs/tools/storage_test.go	2013-05-02 15:55:42 +0000
+++ tools/storage_test.go	2013-07-09 05:06:28 +0000
@@ -7,21 +7,22 @@
 	"bytes"
 	"io"
 	"io/ioutil"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"sort"
+	"strings"
+
 	. "launchpad.net/gocheck"
+
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/dummy"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"sort"
-	"strings"
 )
 
 type StorageSuite struct {
@@ -170,7 +171,7 @@
 
 // downloadTools downloads the supplied tools and extracts them into a
 // new directory.
-func downloadTools(c *C, t *state.Tools) string {
+func downloadTools(c *C, t *tools.Tools) string {
 	resp, err := http.Get(t.URL)
 	c.Assert(err, IsNil)
 	defer resp.Body.Close()
@@ -183,7 +184,7 @@
 }
 
 // downloadToolsRaw downloads the supplied tools and returns the raw bytes.
-func downloadToolsRaw(c *C, t *state.Tools) []byte {
+func downloadToolsRaw(c *C, t *tools.Tools) []byte {
 	log.Infof("dtr1")
 	resp, err := http.Get(t.URL)
 	c.Assert(err, IsNil)

=== modified file 'tools/tools_test.go'
--- tools/tools_test.go	2013-07-07 20:23:30 +0000
+++ tools/tools_test.go	2013-07-09 05:06:28 +0000
@@ -7,32 +7,8 @@
 	stdtesting "testing"
 
 	gc "launchpad.net/gocheck"
-
-	"launchpad.net/juju-core/state"
-	coretesting "launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/tools"
 )
 
 func TestPackage(t *stdtesting.T) {
 	gc.TestingT(t)
 }
-
-var _ = gc.Suite(&ToolsSuite{})
-
-type ToolsSuite struct {
-	coretesting.LoggingSuite
-}
-
-func (s *ToolsSuite) TestToolsMatchStateTools(c *gc.C) {
-	testtools := tools.Tools{}
-	statetools := state.Tools(testtools)
-	testtools2 := tools.Tools(statetools)
-	c.Assert(testtools, gc.Equals, testtools2)
-}
-
-func (s *ToolsSuite) TestToolPointers(c *gc.C) {
-	testtools := &tools.Tools{}
-	statetools := (*state.Tools)(testtools)
-	testtools2 := (*tools.Tools)(statetools)
-	c.Assert(testtools, gc.Equals, testtools2)
-}

=== modified file 'worker/deployer/simple.go'
--- worker/deployer/simple.go	2013-07-08 17:11:44 +0000
+++ worker/deployer/simple.go	2013-07-09 05:06:28 +0000
@@ -15,6 +15,7 @@
 	"launchpad.net/juju-core/log/syslog"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/upstart"
 	"launchpad.net/juju-core/version"
 )
@@ -81,8 +82,8 @@
 
 	// Link the current tools for use by the new agent.
 	tag := state.UnitTag(unitName)
-	_, err = agent.ChangeAgentTools(ctx.dataDir, tag, version.Current)
-	toolsDir := agent.ToolsDir(ctx.dataDir, tag)
+	_, err = tools.ChangeAgentTools(ctx.dataDir, tag, version.Current)
+	toolsDir := tools.ToolsDir(ctx.dataDir, tag)
 	defer removeOnErr(&err, toolsDir)
 
 	// Retrieve addresses from state.
@@ -172,7 +173,7 @@
 		return err
 	}
 	tag := state.UnitTag(unitName)
-	agentDir := agent.Dir(ctx.dataDir, tag)
+	agentDir := tools.Dir(ctx.dataDir, tag)
 	if err := os.RemoveAll(agentDir); err != nil {
 		return err
 	}
@@ -185,7 +186,7 @@
 			logger.Warningf("installer: cannot restart syslog daemon: %v", err)
 		}
 	}()
-	toolsDir := agent.ToolsDir(ctx.dataDir, tag)
+	toolsDir := tools.ToolsDir(ctx.dataDir, tag)
 	return os.Remove(toolsDir)
 }
 

=== modified file 'worker/deployer/simple_test.go'
--- worker/deployer/simple_test.go	2013-07-01 12:38:51 +0000
+++ worker/deployer/simple_test.go	2013-07-09 05:06:28 +0000
@@ -17,6 +17,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker/deployer"
 )
@@ -142,7 +143,7 @@
 	fix.initDir = c.MkDir()
 	fix.logDir = c.MkDir()
 	fix.syslogConfigDir = c.MkDir()
-	toolsDir := agent.SharedToolsDir(fix.dataDir, version.Current)
+	toolsDir := tools.SharedToolsDir(fix.dataDir, version.Current)
 	err := os.MkdirAll(toolsDir, 0755)
 	c.Assert(err, IsNil)
 	jujudPath := filepath.Join(toolsDir, "jujud")
@@ -184,8 +185,8 @@
 func (fix *SimpleToolsFixture) paths(tag string) (confPath, agentDir, toolsDir, syslogConfPath string) {
 	confName := fmt.Sprintf("jujud-%s.conf", tag)
 	confPath = filepath.Join(fix.initDir, confName)
-	agentDir = agent.Dir(fix.dataDir, tag)
-	toolsDir = agent.ToolsDir(fix.dataDir, tag)
+	agentDir = tools.Dir(fix.dataDir, tag)
+	toolsDir = tools.ToolsDir(fix.dataDir, tag)
 	syslogConfPath = filepath.Join(fix.syslogConfigDir, fmt.Sprintf("26-juju-%s.conf", tag))
 	return
 }

=== modified file 'worker/provisioner/lxc-broker.go'
--- worker/provisioner/lxc-broker.go	2013-06-27 04:48:10 +0000
+++ worker/provisioner/lxc-broker.go	2013-07-09 05:06:28 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/loggo"
 )
 
@@ -17,7 +18,7 @@
 
 var _ Broker = (*lxcBroker)(nil)
 
-func NewLxcBroker(config *config.Config, tools *state.Tools) Broker {
+func NewLxcBroker(config *config.Config, tools *tools.Tools) Broker {
 	return &lxcBroker{
 		manager: lxc.NewContainerManager("juju"),
 		config:  config,
@@ -28,7 +29,7 @@
 type lxcBroker struct {
 	manager lxc.ContainerManager
 	config  *config.Config
-	tools   *state.Tools
+	tools   *tools.Tools
 }
 
 func (broker *lxcBroker) StartInstance(machineId, machineNonce string, series string, cons constraints.Value, info *state.Info, apiInfo *api.Info) (instance.Instance, *instance.HardwareCharacteristics, error) {

=== modified file 'worker/provisioner/lxc-broker_test.go'
--- worker/provisioner/lxc-broker_test.go	2013-07-01 01:09:16 +0000
+++ worker/provisioner/lxc-broker_test.go	2013-07-09 05:06:28 +0000
@@ -14,13 +14,13 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/container/lxc"
 	"launchpad.net/juju-core/container/lxc/mock"
-	"launchpad.net/juju-core/environs/agent"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/instance"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing"
 	. "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker/provisioner"
 )
@@ -68,7 +68,7 @@
 
 func (s *lxcBrokerSuite) SetUpTest(c *C) {
 	s.lxcSuite.SetUpTest(c)
-	tools := &state.Tools{
+	tools := &tools.Tools{
 		Binary: version.MustParseBinary("2.3.4-foo-bar"),
 		URL:    "http://tools.example.com/2.3.4-foo-bar.tgz",
 	}
@@ -159,7 +159,7 @@
 	s.CommonProvisionerSuite.SetUpTest(c)
 	s.lxcSuite.SetUpTest(c)
 	// Write the tools file.
-	toolsDir := agent.SharedToolsDir(s.DataDir(), version.Current)
+	toolsDir := tools.SharedToolsDir(s.DataDir(), version.Current)
 	c.Assert(os.MkdirAll(toolsDir, 0755), IsNil)
 	urlPath := filepath.Join(toolsDir, "downloaded-url.txt")
 	err := ioutil.WriteFile(urlPath, []byte("http://example.com/tools"), 0644)

=== modified file 'worker/provisioner/provisioner.go'
--- worker/provisioner/provisioner.go	2013-07-01 01:09:16 +0000
+++ worker/provisioner/provisioner.go	2013-07-09 05:06:28 +0000
@@ -8,11 +8,11 @@
 	"sync"
 
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/agent"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/watcher"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker"
 	"launchpad.net/loggo"
@@ -175,8 +175,8 @@
 	return nil, fmt.Errorf("unknown provisioner type")
 }
 
-func (p *Provisioner) getAgentTools() (*state.Tools, error) {
-	tools, err := agent.ReadTools(p.dataDir, version.Current)
+func (p *Provisioner) getAgentTools() (*tools.Tools, error) {
+	tools, err := tools.ReadTools(p.dataDir, version.Current)
 	if err != nil {
 		logger.Errorf("cannot read agent tools from %q", p.dataDir)
 		return nil, err

=== modified file 'worker/uniter/tools_test.go'
--- worker/uniter/tools_test.go	2013-05-02 15:55:42 +0000
+++ worker/uniter/tools_test.go	2013-07-09 05:06:28 +0000
@@ -6,7 +6,7 @@
 import (
 	"io/ioutil"
 	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/environs/agent"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker/uniter"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
@@ -23,10 +23,10 @@
 
 func (s *ToolsSuite) SetUpTest(c *C) {
 	s.dataDir = c.MkDir()
-	s.toolsDir = agent.SharedToolsDir(s.dataDir, version.Current)
+	s.toolsDir = tools.SharedToolsDir(s.dataDir, version.Current)
 	err := os.MkdirAll(s.toolsDir, 0755)
 	c.Assert(err, IsNil)
-	err = os.Symlink(s.toolsDir, agent.ToolsDir(s.dataDir, "unit-u-123"))
+	err = os.Symlink(s.toolsDir, tools.ToolsDir(s.dataDir, "unit-u-123"))
 	c.Assert(err, IsNil)
 }
 

=== modified file 'worker/uniter/uniter.go'
--- worker/uniter/uniter.go	2013-05-31 08:33:34 +0000
+++ worker/uniter/uniter.go	2013-07-09 05:06:28 +0000
@@ -6,26 +6,28 @@
 import (
 	stderrors "errors"
 	"fmt"
+	"math/rand"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"launchpad.net/tomb"
+
 	corecharm "launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/charm/hooks"
 	"launchpad.net/juju-core/cmd"
-	"launchpad.net/juju-core/environs/agent"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/watcher"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/utils/fslock"
 	"launchpad.net/juju-core/worker/uniter/charm"
 	"launchpad.net/juju-core/worker/uniter/hook"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
 	"launchpad.net/juju-core/worker/uniter/relation"
-	"launchpad.net/tomb"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
 )
 
 // Uniter implements the capabilities of the unit agent. It is not intended to
@@ -139,7 +141,7 @@
 		return err
 	}
 	ename := u.unit.Tag()
-	u.toolsDir = agent.ToolsDir(u.dataDir, ename)
+	u.toolsDir = tools.ToolsDir(u.dataDir, ename)
 	if err := EnsureJujucSymlinks(u.toolsDir); err != nil {
 		return err
 	}

=== modified file 'worker/uniter/uniter_test.go'
--- worker/uniter/uniter_test.go	2013-06-28 12:26:09 +0000
+++ worker/uniter/uniter_test.go	2013-07-09 05:06:28 +0000
@@ -13,7 +13,6 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/goyaml"
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/environs/agent"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/testing"
@@ -21,6 +20,7 @@
 	"launchpad.net/juju-core/state/api/params"
 	coretesting "launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils/fslock"
 	"launchpad.net/juju-core/worker"
 	"launchpad.net/juju-core/worker/uniter"
@@ -60,7 +60,7 @@
 	s.JujuConnSuite.SetUpSuite(c)
 	s.HTTPSuite.SetUpSuite(c)
 	s.dataDir = c.MkDir()
-	toolsDir := agent.ToolsDir(s.dataDir, "unit-u-0")
+	toolsDir := tools.ToolsDir(s.dataDir, "unit-u-0")
 	err := os.MkdirAll(toolsDir, 0755)
 	c.Assert(err, IsNil)
 	cmd := exec.Command("go", "build", "launchpad.net/juju-core/cmd/jujud")