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

[Tim Penhey]

Make agent/tools and remove state.Tools

This branch makes an agent/tools package that is all things tools.
The environs/tools package is merged in there. There is a test
to ensure that we don't bring in extra package dependencies to
tools, right now just "utils/set" and "version".

https://codereview.appspot.com/11561044/

Make agent/tools and remove state.Tools

This branch makes an agent/tools package that is all things tools.
The environs/tools package is merged in there. There is a test
to ensure that we don't bring in extra package dependencies to
tools, right now just "utils/set" and "version".

https://codereview.appspot.com/11561044/

[Tim Penhey (thumper)]

Reviewers: mp+176111_code.launchpad.net,

Message:
Please take a look.

Description:
Make agent/tools and remove state.Tools

This branch makes an agent/tools package that is all things tools.
The environs/tools package is merged in there. There is a test
to ensure that we don't bring in extra package dependencies to
tools, right now just "utils/set" and "version".

https://code.launchpad.net/~thumper/juju-core/agent-tools/+merge/176111

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M agent/agent.go
   M agent/tools/build.go
   M agent/tools/build_test.go
   M agent/tools/diskmanager.go
   M agent/tools/diskmanager_test.go
   M agent/tools/export_test.go
   M agent/tools/list.go
   M agent/tools/list_test.go
   A agent/tools/marshal.go
   A agent/tools/marshal_test.go
   A agent/tools/package_test.go
   M agent/tools/storage.go
   M agent/tools/storage_test.go
   M agent/tools/tools.go
   M agent/tools/tools_test.go
   M agent/tools/toolsdir.go
   D agent/tools_compat_test.go
   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/azure/customdata_test.go
   M environs/azure/environ.go
   M environs/cloudinit/cloudinit.go
   M environs/cloudinit/cloudinit_test.go
   M environs/cloudinit_test.go
   M environs/ec2/ec2.go
   M environs/jujutest/livetests.go
   M environs/local/environ.go
   M environs/maas/environ.go
   M environs/maas/environ_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
   A testing/imports.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

[Ian Booth (wallyworld)]

LGTM

https://codereview.appspot.com/11561044/diff/1/agent/tools/storage.go
File agent/tools/storage.go (right):

https://codereview.appspot.com/11561044/diff/1/agent/tools/storage.go#newcode84
agent/tools/storage.go:84: // environs.Storage; it exists to avoid a
dependency on environs.
Perhaps this is no longer relevant with the refactoring?

https://codereview.appspot.com/11561044/

[Tim Penhey (thumper)]

https://codereview.appspot.com/11561044/diff/1/agent/tools/storage.go
File agent/tools/storage.go (right):

https://codereview.appspot.com/11561044/diff/1/agent/tools/storage.go#newcode84
agent/tools/storage.go:84: // environs.Storage; it exists to avoid a
dependency on environs.
On 2013/07/22 04:52:03, wallyworld wrote:
> Perhaps this is no longer relevant with the refactoring?

It is still valid. We don't want to bring in the environs package as a
dependency.

https://codereview.appspot.com/11561044/

[Jeroen T. Vermeulen (jtv)]

LGTM — of course I can't comment on the actual change, because my brain
stopped working after a thousand lines of collateral damage. This may
be a fun language for re-inventing wheels in, but it's not good for
engineering.

As discussed on IRC, the test against new dependencies needs commenting
because adding a dependency _can_ be a bug but in general is merely
undesirable.

The loop in FindJujuCoreImports is an abomination. Is there some better
way of phrasing this? I realize Go forces your hand to some extent, but
there must be *something* less like assembly language. For penance,
re-read Goto Considered Harmful.

https://codereview.appspot.com/11561044/

[Go Bot (go-bot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Roger Peppe (rogpeppe)]

LGTM with some suggestions below.

I think this is a good example of how we can
refactor without fear given a statically typed
language.

https://codereview.appspot.com/11561044/diff/1/agent/tools/diskmanager.go
File agent/tools/diskmanager.go (right):

https://codereview.appspot.com/11561044/diff/1/agent/tools/diskmanager.go#newcode29
agent/tools/diskmanager.go:29: return UnpackTools(d.dataDir, tools, r)
nice change

https://codereview.appspot.com/11561044/diff/1/agent/tools/list_test.go
File agent/tools/list_test.go (right):

https://codereview.appspot.com/11561044/diff/1/agent/tools/list_test.go#newcode7
agent/tools/list_test.go:7: gc "launchpad.net/gocheck"
in this already huge CL, it would perhaps be nice to keep unnecessary
changes to a minimum, though I appreciate these are fairly automatic.

https://codereview.appspot.com/11561044/diff/1/agent/tools/tools_test.go
File agent/tools/tools_test.go (right):

https://codereview.appspot.com/11561044/diff/1/agent/tools/tools_test.go#newcode13
agent/tools/tools_test.go:13: gc "launchpad.net/gocheck"
again, it would be nice to restrict changes to those directly relevant
to this CL.

https://codereview.appspot.com/11561044/diff/1/testing/imports.go
File testing/imports.go (right):

https://codereview.appspot.com/11561044/diff/1/testing/imports.go#newcode16
testing/imports.go:16: // imported by the packageName parameter. The
resulting list removes the
// imported by the package with the given name.
?

https://codereview.appspot.com/11561044/diff/1/testing/imports.go#newcode19
testing/imports.go:19: var imports []string
i don't think you need to traverse SrcDirs manually.

i think you probably want something like the following:

pkg, err := build.Import(packageName)
if err != nil {
    c.Fatalf("cannot import %q: %v", packageName, err)
}
[...]
for _, name := range pkg.Imports {
[...]

https://codereview.appspot.com/11561044/diff/1/testing/imports.go#newcode31
testing/imports.go:31: c.Logf(packageName + " not found")
probably c.Fatalf, but no need if you make the change above.

https://codereview.appspot.com/11561044/

=== modified file 'agent/agent.go'
--- agent/agent.go	2013-07-19 17:18:27 +0000
+++ agent/agent.go	2013-07-23 21:14:24 +0000
@@ -12,6 +12,7 @@
 
 	"launchpad.net/goyaml"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
@@ -60,7 +61,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
@@ -106,7 +107,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.

=== added directory 'agent/tools'
=== renamed file 'environs/tools/build.go' => 'agent/tools/build.go'
--- environs/tools/build.go	2013-07-17 01:39:18 +0000
+++ agent/tools/build.go	2013-07-23 21:14:24 +0000
@@ -14,13 +14,9 @@
 	"path/filepath"
 	"strings"
 
-	"launchpad.net/loggo"
-
 	"launchpad.net/juju-core/version"
 )
 
-var logger = loggo.GetLogger("juju.environs.tools")
-
 // archive writes the executable files found in the given directory in
 // gzipped tar format to w.  An error is returned if an entry inside dir
 // is not a regular executable file.

=== renamed file 'environs/tools/build_test.go' => 'agent/tools/build_test.go'
--- environs/tools/build_test.go	2013-07-17 01:32:32 +0000
+++ agent/tools/build_test.go	2013-07-23 21:14:24 +0000
@@ -11,7 +11,7 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/environs/tools"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/testing"
 )
 

=== renamed file 'agent/diskmanager.go' => 'agent/tools/diskmanager.go'
--- agent/diskmanager.go	2013-07-09 11:31:00 +0000
+++ agent/tools/diskmanager.go	2013-07-23 21:14:24 +0000
@@ -1,12 +1,11 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package agent
+package tools
 
 import (
 	"io"
 
-	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/version"
 )
 
@@ -23,12 +22,11 @@
 }
 
 func (d *DiskManager) ReadTools(vers version.Binary) (*Tools, error) {
-	stTools, err := ReadTools(d.dataDir, vers)
-	return (*Tools)(stTools), err
+	return ReadTools(d.dataDir, vers)
 }
 
 func (d *DiskManager) UnpackTools(tools *Tools, r io.Reader) error {
-	return UnpackTools(d.dataDir, (*state.Tools)(tools), r)
+	return UnpackTools(d.dataDir, tools, r)
 }
 
 func (d *DiskManager) SharedToolsDir(vers version.Binary) string {

=== renamed file 'agent/diskmanager_test.go' => 'agent/tools/diskmanager_test.go'
--- agent/diskmanager_test.go	2013-07-09 11:31:00 +0000
+++ agent/tools/diskmanager_test.go	2013-07-23 21:14:24 +0000
@@ -1,7 +1,7 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package agent_test
+package tools_test
 
 import (
 	"bytes"
@@ -9,25 +9,25 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	coretesting "launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/version"
 )
 
 var _ = gc.Suite(&DiskManagerSuite{})
 
-var _ agent.ToolsManager = (*agent.DiskManager)(nil)
+var _ tools.ToolsManager = (*tools.DiskManager)(nil)
 
 type DiskManagerSuite struct {
 	coretesting.LoggingSuite
 	dataDir string
-	manager agent.ToolsManager
+	manager tools.ToolsManager
 }
 
 func (s *DiskManagerSuite) SetUpTest(c *gc.C) {
 	s.LoggingSuite.SetUpTest(c)
 	s.dataDir = c.MkDir()
-	s.manager = agent.NewDiskManager(s.dataDir)
+	s.manager = tools.NewDiskManager(s.dataDir)
 }
 
 func (s *DiskManagerSuite) toolsDir() string {
@@ -41,7 +41,7 @@
 		coretesting.NewTarFile("bar", 0755, "bar contents"),
 		coretesting.NewTarFile("foo", 0755, "foo contents"),
 	}
-	t1 := &agent.Tools{
+	t1 := &tools.Tools{
 		URL:    "http://foo/bar",
 		Binary: version.MustParseBinary("1.2.3-foo-bar"),
 	}
@@ -53,7 +53,7 @@
 
 	// Try to unpack the same version of tools again - it should succeed,
 	// leaving the original version around.
-	t2 := &agent.Tools{
+	t2 := &tools.Tools{
 		URL:    "http://arble",
 		Binary: version.MustParseBinary("1.2.3-foo-bar"),
 	}
@@ -68,20 +68,20 @@
 }
 
 func (t *DiskManagerSuite) TestSharedToolsDir(c *gc.C) {
-	manager := agent.NewDiskManager("/var/lib/juju")
+	manager := tools.NewDiskManager("/var/lib/juju")
 	dir := manager.SharedToolsDir(version.MustParseBinary("1.2.3-precise-amd64"))
 	c.Assert(dir, gc.Equals, "/var/lib/juju/tools/1.2.3-precise-amd64")
 }
 
 // assertToolsContents asserts that the directory for the tools
 // has the given contents.
-func (s *DiskManagerSuite) assertToolsContents(c *gc.C, t *agent.Tools, files []*coretesting.TarFile) {
+func (s *DiskManagerSuite) assertToolsContents(c *gc.C, t *tools.Tools, files []*coretesting.TarFile) {
 	var wantNames []string
 	for _, f := range files {
 		wantNames = append(wantNames, f.Header.Name)
 	}
 	wantNames = append(wantNames, urlFile)
-	dir := s.manager.(*agent.DiskManager).SharedToolsDir(t.Binary)
+	dir := s.manager.(*tools.DiskManager).SharedToolsDir(t.Binary)
 	assertDirNames(c, dir, wantNames)
 	assertFileContents(c, dir, urlFile, t.URL, 0200)
 	for _, f := range files {

=== renamed file 'environs/tools/export_test.go' => 'agent/tools/export_test.go'
=== renamed file 'environs/tools/list.go' => 'agent/tools/list.go'
--- environs/tools/list.go	2013-05-02 15:55:42 +0000
+++ agent/tools/list.go	2013-07-23 21:14:24 +0000
@@ -4,16 +4,15 @@
 package tools
 
 import (
-	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/state"
+	"strings"
+
 	"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 +25,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))
@@ -98,7 +97,7 @@
 		}
 	}
 	if len(result) == 0 {
-		log.Errorf("environs/tools: cannot match %#v", f)
+		logger.Errorf("cannot match %#v", f)
 		return nil, ErrNoMatches
 	}
 	return result, nil
@@ -125,7 +124,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' => 'agent/tools/list_test.go'
--- environs/tools/list_test.go	2013-07-09 12:11:13 +0000
+++ agent/tools/list_test.go	2013-07-23 21:14:24 +0000
@@ -4,23 +4,18 @@
 package tools_test
 
 import (
-	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/state"
+	gc "launchpad.net/gocheck"
+
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/version"
-	"testing"
 )
 
-func TestPackage(t *testing.T) {
-	TestingT(t)
-}
-
 type ListSuite struct{}
 
-var _ = Suite(&ListSuite{})
+var _ = gc.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://testing.invalid/" + name,
 	}
@@ -73,10 +68,10 @@
 	expect: []string{"precise", "quantal"},
 }}
 
-func (s *ListSuite) TestSeries(c *C) {
+func (s *ListSuite) TestSeries(c *gc.C) {
 	for i, test := range seriesTests {
 		c.Logf("test %d", i)
-		c.Check(test.src.Series(), DeepEquals, test.expect)
+		c.Check(test.src.Series(), gc.DeepEquals, test.expect)
 	}
 }
 
@@ -91,19 +86,19 @@
 	expect: []string{"amd64", "i386"},
 }}
 
-func (s *ListSuite) TestArches(c *C) {
+func (s *ListSuite) TestArches(c *gc.C) {
 	for i, test := range archesTests {
 		c.Logf("test %d", i)
-		c.Check(test.src.Arches(), DeepEquals, test.expect)
+		c.Check(test.src.Arches(), gc.DeepEquals, test.expect)
 	}
 }
 
-func (s *ListSuite) TestURLs(c *C) {
+func (s *ListSuite) TestURLs(c *gc.C) {
 	empty := tools.List{}
-	c.Check(empty.URLs(), DeepEquals, map[version.Binary]string{})
+	c.Check(empty.URLs(), gc.DeepEquals, map[version.Binary]string{})
 
 	full := tools.List{t100precise, t190quantal, t2001precise}
-	c.Check(full.URLs(), DeepEquals, map[version.Binary]string{
+	c.Check(full.URLs(), gc.DeepEquals, map[version.Binary]string{
 		t100precise.Binary:  t100precise.URL,
 		t190quantal.Binary:  t190quantal.URL,
 		t2001precise.Binary: t2001precise.URL,
@@ -136,12 +131,12 @@
 	number: version.MustParse("2.0.0.1"),
 }}
 
-func (s *ListSuite) TestNewest(c *C) {
+func (s *ListSuite) TestNewest(c *gc.C) {
 	for i, test := range newestTests {
 		c.Logf("test %d", i)
 		number, actual := test.src.Newest()
-		c.Check(number, DeepEquals, test.number)
-		c.Check(actual, DeepEquals, test.expect)
+		c.Check(number, gc.DeepEquals, test.number)
+		c.Check(actual, gc.DeepEquals, test.expect)
 	}
 }
 
@@ -179,10 +174,10 @@
 	t100all,
 }}
 
-func (s *ListSuite) TestExclude(c *C) {
+func (s *ListSuite) TestExclude(c *gc.C) {
 	for i, test := range excludeTests {
 		c.Logf("test %d", i)
-		c.Check(test.src.Exclude(test.arg), DeepEquals, test.expect)
+		c.Check(test.src.Exclude(test.arg), gc.DeepEquals, test.expect)
 	}
 }
 
@@ -241,15 +236,15 @@
 	tools.List{t200quantal32},
 }}
 
-func (s *ListSuite) TestMatch(c *C) {
+func (s *ListSuite) TestMatch(c *gc.C) {
 	for i, test := range matchTests {
 		c.Logf("test %d", i)
 		actual, err := test.src.Match(test.filter)
-		c.Check(actual, DeepEquals, test.expect)
+		c.Check(actual, gc.DeepEquals, test.expect)
 		if len(test.expect) > 0 {
-			c.Check(err, IsNil)
+			c.Check(err, gc.IsNil)
 		} else {
-			c.Check(err, Equals, tools.ErrNoMatches)
+			c.Check(err, gc.Equals, tools.ErrNoMatches)
 		}
 	}
 }

=== added file 'agent/tools/marshal.go'
--- agent/tools/marshal.go	1970-01-01 00:00:00 +0000
+++ agent/tools/marshal.go	2013-07-23 21:14:24 +0000
@@ -0,0 +1,40 @@
+// 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
+}
+
+// GetBSON returns the structure to be serialized for the tools as a generic
+// interface.
+func (t *Tools) GetBSON() (interface{}, error) {
+	if t == nil {
+		return nil, nil
+	}
+	return &toolsDoc{t.Binary, t.URL}, nil
+}
+
+// SetBSON updates the internal members with the data stored in the bson.Raw
+// parameter.
+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 'agent/tools/marshal_test.go'
--- agent/tools/marshal_test.go	1970-01-01 00:00:00 +0000
+++ agent/tools/marshal_test.go	2013-07-23 21:14:24 +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/agent/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)
+}

=== added file 'agent/tools/package_test.go'
--- agent/tools/package_test.go	1970-01-01 00:00:00 +0000
+++ agent/tools/package_test.go	2013-07-23 21:14:24 +0000
@@ -0,0 +1,14 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package tools_test
+
+import (
+	"testing"
+
+	gc "launchpad.net/gocheck"
+)
+
+func Test(t *testing.T) {
+	gc.TestingT(t)
+}

=== renamed file 'environs/tools/storage.go' => 'agent/tools/storage.go'
--- environs/tools/storage.go	2013-07-16 04:23:41 +0000
+++ agent/tools/storage.go	2013-07-23 21:14:24 +0000
@@ -11,7 +11,6 @@
 	"os"
 	"strings"
 
-	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/version"
 )
 
@@ -57,7 +56,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
@@ -82,7 +81,7 @@
 }
 
 // URLPutter exposes to Upload the relevant capabilities of an
-// environs.Storage; it exists to foil an import cycle.
+// environs.Storage; it exists to avoid a dependency on environs.
 type URLPutter interface {
 	URL(name string) (string, error)
 	Put(name string, r io.Reader, length int64) error
@@ -95,7 +94,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.
 
@@ -147,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' => 'agent/tools/storage_test.go'
--- environs/tools/storage_test.go	2013-05-02 15:55:42 +0000
+++ agent/tools/storage_test.go	2013-07-23 21:14:24 +0000
@@ -7,21 +7,21 @@
 	"bytes"
 	"io"
 	"io/ioutil"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"sort"
+	"strings"
+
 	. "launchpad.net/gocheck"
+
+	"launchpad.net/juju-core/agent/tools"
 	"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/version"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"sort"
-	"strings"
 )
 
 type StorageSuite struct {
@@ -170,7 +170,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,17 +183,14 @@
 }
 
 // downloadToolsRaw downloads the supplied tools and returns the raw bytes.
-func downloadToolsRaw(c *C, t *state.Tools) []byte {
-	log.Infof("dtr1")
+func downloadToolsRaw(c *C, t *tools.Tools) []byte {
 	resp, err := http.Get(t.URL)
 	c.Assert(err, IsNil)
 	defer resp.Body.Close()
-	log.Infof("dtr5")
 	c.Assert(resp.StatusCode, Equals, http.StatusOK)
 	var buf bytes.Buffer
 	_, err = io.Copy(&buf, resp.Body)
 	c.Assert(err, IsNil)
-	log.Infof("dtr9")
 	return buf.Bytes()
 }
 

=== renamed file 'agent/interfaces.go' => 'agent/tools/tools.go'
--- agent/interfaces.go	2013-07-09 11:31:00 +0000
+++ agent/tools/tools.go	2013-07-23 21:14:24 +0000
@@ -1,14 +1,18 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package agent
+package tools
 
 import (
 	"io"
 
+	"launchpad.net/loggo"
+
 	"launchpad.net/juju-core/version"
 )
 
+var logger = loggo.GetLogger("juju.agent.tools")
+
 type Tools struct {
 	version.Binary
 	URL string

=== renamed file 'agent/tools_test.go' => 'agent/tools/tools_test.go'
--- agent/tools_test.go	2013-07-09 11:31:00 +0000
+++ agent/tools/tools_test.go	2013-07-23 21:14:24 +0000
@@ -1,7 +1,7 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package agent_test
+package tools_test
 
 import (
 	"bytes"
@@ -10,10 +10,9 @@
 	"path/filepath"
 	"sort"
 
-	. "launchpad.net/gocheck"
+	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent"
-	"launchpad.net/juju-core/state"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/version"
 )
@@ -23,13 +22,23 @@
 	dataDir string
 }
 
-var _ = Suite(&ToolsSuite{})
+var _ = gc.Suite(&ToolsSuite{})
 
-func (t *ToolsSuite) SetUpTest(c *C) {
+func (t *ToolsSuite) SetUpTest(c *gc.C) {
 	t.LoggingSuite.SetUpTest(c)
 	t.dataDir = c.MkDir()
 }
 
+func (t *ToolsSuite) TestPackageDependencies(c *gc.C) {
+	// This test is to ensure we don't bring in dependencies on state, environ
+	// or any of the other bigger packages that'll drag in yet more dependencies.
+	// Only imports that start with "launchpad.net/juju-core" are checked, and the
+	// resulting slice has that prefix removed to keep the output short.
+	c.Assert(testing.FindJujuCoreImports(c, "launchpad.net/juju-core/agent/tools"),
+		gc.DeepEquals,
+		[]string{"utils/set", "version"})
+}
+
 const urlFile = "downloaded-url.txt"
 
 // gzyesses holds the result of running:
@@ -68,15 +77,15 @@
 	},
 }
 
-func (t *ToolsSuite) TestUnpackToolsBadData(c *C) {
+func (t *ToolsSuite) TestUnpackToolsBadData(c *gc.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))
-		c.Assert(err, ErrorMatches, test.err)
+		err := tools.UnpackTools(t.dataDir, testTools, bytes.NewReader(test.data))
+		c.Assert(err, gc.ErrorMatches, test.err)
 		assertDirNames(c, t.toolsDir(), []string{})
 	}
 }
@@ -85,24 +94,24 @@
 	return filepath.Join(t.dataDir, "tools")
 }
 
-func (t *ToolsSuite) TestUnpackToolsContents(c *C) {
+func (t *ToolsSuite) TestUnpackToolsContents(c *gc.C) {
 	files := []*testing.TarFile{
 		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...)))
-	c.Assert(err, IsNil)
+	err := tools.UnpackTools(t.dataDir, testTools, bytes.NewReader(testing.TarGz(files...)))
+	c.Assert(err, gc.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"),
 	}
@@ -110,114 +119,114 @@
 		testing.NewTarFile("bar", 0755, "bar2 contents"),
 		testing.NewTarFile("x", 0755, "x contents"),
 	}
-	err = agent.UnpackTools(t.dataDir, tools2, bytes.NewReader(testing.TarGz(files2...)))
-	c.Assert(err, IsNil)
+	err = tools.UnpackTools(t.dataDir, tools2, bytes.NewReader(testing.TarGz(files2...)))
+	c.Assert(err, gc.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) {
+func (t *ToolsSuite) TestReadToolsErrors(c *gc.C) {
 	vers := version.MustParseBinary("1.2.3-precise-amd64")
-	tools, err := agent.ReadTools(t.dataDir, vers)
-	c.Assert(tools, IsNil)
-	c.Assert(err, ErrorMatches, "cannot read URL in tools directory: .*")
+	testTools, err := tools.ReadTools(t.dataDir, vers)
+	c.Assert(testTools, gc.IsNil)
+	c.Assert(err, gc.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)
+	c.Assert(err, gc.IsNil)
 
 	err = ioutil.WriteFile(filepath.Join(dir, urlFile), []byte(" \t\n"), 0644)
-	c.Assert(err, IsNil)
+	c.Assert(err, gc.IsNil)
 
-	tools, err = agent.ReadTools(t.dataDir, vers)
-	c.Assert(tools, IsNil)
-	c.Assert(err, ErrorMatches, "empty URL in tools directory.*")
+	testTools, err = tools.ReadTools(t.dataDir, vers)
+	c.Assert(testTools, gc.IsNil)
+	c.Assert(err, gc.ErrorMatches, "empty URL in tools directory.*")
 }
 
-func (t *ToolsSuite) TestChangeAgentTools(c *C) {
+func (t *ToolsSuite) TestChangeAgentTools(c *gc.C) {
 	files := []*testing.TarFile{
 		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...)))
-	c.Assert(err, IsNil)
+	err := tools.UnpackTools(t.dataDir, testTools, bytes.NewReader(testing.TarGz(files...)))
+	c.Assert(err, gc.IsNil)
 
-	gotTools, err := agent.ChangeAgentTools(t.dataDir, "testagent", tools.Binary)
-	c.Assert(err, IsNil)
-	c.Assert(*gotTools, Equals, *tools)
+	gotTools, err := tools.ChangeAgentTools(t.dataDir, "testagent", testTools.Binary)
+	c.Assert(err, gc.IsNil)
+	c.Assert(*gotTools, gc.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...)))
-	c.Assert(err, IsNil)
+	err = tools.UnpackTools(t.dataDir, tools2, bytes.NewReader(testing.TarGz(files2...)))
+	c.Assert(err, gc.IsNil)
 
-	gotTools, err = agent.ChangeAgentTools(t.dataDir, "testagent", tools2.Binary)
-	c.Assert(err, IsNil)
-	c.Assert(*gotTools, Equals, *tools2)
+	gotTools, err = tools.ChangeAgentTools(t.dataDir, "testagent", tools2.Binary)
+	c.Assert(err, gc.IsNil)
+	c.Assert(*gotTools, gc.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"))
-	c.Assert(dir, Equals, "/var/lib/juju/tools/1.2.3-precise-amd64")
+func (t *ToolsSuite) TestSharedToolsDir(c *gc.C) {
+	dir := tools.SharedToolsDir("/var/lib/juju", version.MustParseBinary("1.2.3-precise-amd64"))
+	c.Assert(dir, gc.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 *gc.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)
-	c.Assert(err, IsNil)
-	c.Assert(*gotTools, Equals, *tools)
+	gotTools, err := tools.ReadTools(t.dataDir, testTools.Binary)
+	c.Assert(err, gc.IsNil)
+	c.Assert(*gotTools, gc.Equals, *testTools)
 }
 
 // assertFileContents asserts that the given file in the
 // given directory has the given contents.
-func assertFileContents(c *C, dir, file, contents string, mode os.FileMode) {
+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, IsNil)
-	c.Assert(info.Mode()&(os.ModeType|mode), Equals, mode)
+	c.Assert(err, gc.IsNil)
+	c.Assert(info.Mode()&(os.ModeType|mode), gc.Equals, mode)
 	data, err := ioutil.ReadFile(file)
-	c.Assert(err, IsNil)
-	c.Assert(string(data), Equals, contents)
+	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 *C, dir string, names []string) {
+func assertDirNames(c *gc.C, dir string, names []string) {
 	f, err := os.Open(dir)
-	c.Assert(err, IsNil)
+	c.Assert(err, gc.IsNil)
 	defer f.Close()
 	dnames, err := f.Readdirnames(0)
-	c.Assert(err, IsNil)
+	c.Assert(err, gc.IsNil)
 	sort.Strings(dnames)
 	sort.Strings(names)
-	c.Assert(dnames, DeepEquals, names)
+	c.Assert(dnames, gc.DeepEquals, names)
 }

=== renamed file 'agent/tools.go' => 'agent/tools/toolsdir.go'
--- agent/tools.go	2013-05-02 15:55:42 +0000
+++ agent/tools/toolsdir.go	2013-07-23 21:14:24 +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,11 @@
 	"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/version"
 )
 
 const urlFile = "downloaded-url.txt"
@@ -42,7 +41,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
@@ -104,7 +103,7 @@
 	if err == nil || os.IsNotExist(err) {
 		return
 	}
-	log.Warningf("environs: cannot remove %q: %v", dir, err)
+	logger.Warningf("cannot remove %q: %v", dir, err)
 }
 
 func writeFile(name string, mode os.FileMode, r io.Reader) error {
@@ -119,7 +118,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 +130,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 +139,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

=== removed file 'agent/tools_compat_test.go'
--- agent/tools_compat_test.go	2013-07-10 13:13:43 +0000
+++ agent/tools_compat_test.go	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-// Copyright 2013 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-package agent_test
-
-import (
-	gc "launchpad.net/gocheck"
-
-	"launchpad.net/juju-core/agent"
-	"launchpad.net/juju-core/state"
-	coretesting "launchpad.net/juju-core/testing"
-)
-
-//TODO: When we get rid of *state.Tools, we won't need this test suite.
-//      This is used to ensure state.Tools is compatible with agent.Tools so we
-//      can migrate code over to agent.Tools and cast when needed
-var _ = gc.Suite(&ToolsCompatSuite{})
-
-type ToolsCompatSuite struct {
-	coretesting.LoggingSuite
-}
-
-func (s *ToolsCompatSuite) TestToolsMatchStateTools(c *gc.C) {
-	testtools := agent.Tools{}
-	statetools := state.Tools(testtools)
-	testtools2 := agent.Tools(statetools)
-	c.Assert(testtools, gc.Equals, testtools2)
-}
-
-func (s *ToolsCompatSuite) TestToolPointers(c *gc.C) {
-	testtools := &agent.Tools{}
-	statetools := (*state.Tools)(testtools)
-	testtools2 := (*agent.Tools)(statetools)
-	c.Assert(testtools, gc.Equals, testtools2)
-}

=== 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-23 21:14:24 +0000
@@ -6,12 +6,12 @@
 import (
 	"bytes"
 	. "launchpad.net/gocheck"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/constraints"
 	"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/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-23 21:14:24 +0000
@@ -6,7 +6,11 @@
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	"launchpad.net/gnuflag"
+
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs"
@@ -16,7 +20,6 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/utils/set"
-	"strings"
 )
 
 type StatusCommand struct {
@@ -319,7 +322,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-17 10:30:12 +0000
+++ cmd/juju/status_test.go	2013-07-23 21:14:24 +0000
@@ -12,6 +12,7 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/goyaml"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/constraints"
@@ -233,7 +234,7 @@
 			},
 		},
 
-		setTools{"0", &state.Tools{
+		setTools{"0", &tools.Tools{
 			Binary: version.Binary{
 				Number: version.MustParse("1.2.3"),
 				Series: "gutsy",
@@ -924,7 +925,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-07-12 08:32:29 +0000
+++ cmd/juju/synctools.go	2013-07-23 21:14:24 +0000
@@ -13,12 +13,11 @@
 	"sort"
 
 	"launchpad.net/gnuflag"
+	"launchpad.net/juju-core/agent/tools"
 	"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/version"
 )
 
@@ -48,8 +47,8 @@
 to run without having to access Amazon. Alternatively you can specify
 a local directory as source.
 
-Sometimes this is because the environment does not have public access, 
-and sometimes you just want to avoid having to access data outside of 
+Sometimes this is because the environment does not have public access,
+and sometimes you just want to avoid having to access data outside of
 the local cloud.
 `,
 	}
@@ -72,7 +71,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)
@@ -99,7 +98,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-07-12 08:32:29 +0000
+++ cmd/juju/synctools_test.go	2013-07-23 21:14:24 +0000
@@ -9,11 +9,11 @@
 	"path/filepath"
 
 	. "launchpad.net/gocheck"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/cmd"
 	"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/version"
 )

=== modified file 'cmd/juju/upgradejuju.go'
--- cmd/juju/upgradejuju.go	2013-05-31 01:02:53 +0000
+++ cmd/juju/upgradejuju.go	2013-07-23 21:14:24 +0000
@@ -7,10 +7,10 @@
 	stderrors "errors"
 	"fmt"
 	"launchpad.net/gnuflag"
+	"launchpad.net/juju-core/agent/tools"
 	"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"

=== 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-23 21:14:24 +0000
@@ -5,12 +5,13 @@
 
 import (
 	"io/ioutil"
+
 	. "launchpad.net/gocheck"
+
+	"launchpad.net/juju-core/agent/tools"
 	"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/version"
 )
@@ -280,9 +281,9 @@
 
 // mockUploadTools simulates the effect of tools.Upload, but skips the time-
 // consuming build from source.
-// TODO(fwereade) better factor environs/tools such that build logic is
+// TODO(fwereade) better factor agent/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-19 17:12:37 +0000
+++ cmd/jujud/agent.go	2013-07-23 21:14:24 +0000
@@ -11,6 +11,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/log"
@@ -86,7 +87,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-07-09 11:31:00 +0000
+++ cmd/jujud/agent_test.go	2013-07-23 21:14:24 +0000
@@ -15,8 +15,8 @@
 	. "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/cmd"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/machineagent"
@@ -46,8 +46,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"),
 	}
 }
@@ -119,11 +119,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) {
+	agentTools := 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, agentTools)
 
 	conf := &agent.Conf{
 		DataDir:   s.DataDir(),
@@ -136,7 +136,7 @@
 	conf.APIInfo.Password = password
 	err = conf.Write()
 	c.Assert(err, IsNil)
-	return conf, tools
+	return conf, agentTools
 }
 
 // initAgent initialises the given agent command with additional
@@ -158,7 +158,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()),
 	)
@@ -167,22 +167,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)
+	agentTools := s.uploadTools(c, vers)
+	resp, err := http.Get(agentTools.URL)
 	c.Assert(err, IsNil)
 	defer resp.Body.Close()
-	err = agent.UnpackTools(s.DataDir(), tools, resp.Body)
+	err = tools.UnpackTools(s.DataDir(), agentTools, resp.Body)
 	c.Assert(err, IsNil)
-	return tools
+	return agentTools
 }
 
 func (s *agentSuite) testOpenAPIState(c *C, ent entity, agentCmd Agent) {
@@ -248,7 +248,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-07-19 17:12:37 +0000
+++ cmd/jujud/machine_test.go	2013-07-23 21:14:24 +0000
@@ -12,6 +12,7 @@
 	. "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/constraints"
@@ -62,7 +63,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", instance.HardwareCharacteristics{}, jobs...)
 	c.Assert(err, IsNil)
 	err = m.SetMongoPassword("machine-password")

=== modified file 'cmd/jujud/unit_test.go'
--- cmd/jujud/unit_test.go	2013-07-19 09:53:58 +0000
+++ cmd/jujud/unit_test.go	2013-07-23 21:14:24 +0000
@@ -9,6 +9,7 @@
 	. "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
@@ -34,7 +35,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-07-09 11:31:00 +0000
+++ cmd/jujud/upgrade.go	2013-07-23 21:14:24 +0000
@@ -10,7 +10,7 @@
 
 	"launchpad.net/tomb"
 
-	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/downloader"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/errors"
@@ -38,8 +38,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
 }
 
@@ -49,7 +49,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
 	}
@@ -90,13 +90,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,
 		}
 	}
@@ -120,7 +120,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
@@ -191,7 +191,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)
 			}
@@ -210,24 +210,24 @@
 			downloadTools = tools
 			downloadDone = download.Done()
 		case status := <-downloadDone:
-			tools := downloadTools
+			newTools := 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", newTools.Binary, status.Err)
 				noDelay()
 				break
 			}
-			err := agent.UnpackTools(u.dataDir, tools, status.File)
+			err := tools.UnpackTools(u.dataDir, newTools, 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", newTools.Binary, err)
 				noDelay()
 				break
 			}
-			return u.upgradeReady(currentTools, tools)
+			return u.upgradeReady(currentTools, newTools)
 		case <-tomb.Dying():
 			if download != nil {
 				return fmt.Errorf("upgrader aborted download of %q", downloadTools.URL)
@@ -238,7 +238,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-07-17 08:18:27 +0000
+++ cmd/jujud/upgrade_test.go	2013-07-23 21:14:24 +0000
@@ -11,10 +11,9 @@
 
 	. "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/environs/dummy"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/state"
 	coretesting "launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/version"
@@ -39,7 +38,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)
 }
@@ -138,7 +137,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
@@ -156,17 +155,17 @@
 			}
 
 			ug := waitDeath(c, u)
-			tools := uploaded[test.upgrade]
-			c.Check(ug.NewTools, DeepEquals, tools)
+			newTools := uploaded[test.upgrade]
+			c.Check(ug.NewTools, DeepEquals, newTools)
 			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(), newTools.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 "+newTools.Binary.String())
 		}()
 	}
 }
@@ -280,13 +279,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")
@@ -314,8 +313,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:
@@ -341,9 +340,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-18 21:43:30 +0000
+++ container/lxc/lxc.go	2013-07-23 21:14:24 +0000
@@ -11,6 +11,9 @@
 	"strings"
 
 	"launchpad.net/golxc"
+	"launchpad.net/loggo"
+
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/cloudinit"
@@ -18,7 +21,6 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
-	"launchpad.net/loggo"
 )
 
 var logger = loggo.GetLogger("juju.container.lxc")
@@ -45,7 +47,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)
@@ -74,7 +76,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) {
@@ -239,7 +241,7 @@
 
 func writeUserData(
 	directory, machineId, nonce string,
-	tools *state.Tools,
+	tools *tools.Tools,
 	environConfig *config.Config,
 	stateInfo *state.Info,
 	apiInfo *api.Info,
@@ -259,7 +261,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-07-18 21:43:30 +0000
+++ container/lxc/lxc_test.go	2013-07-23 21:14:24 +0000
@@ -14,10 +14,10 @@
 	"launchpad.net/goyaml"
 	"launchpad.net/loggo"
 
+	"launchpad.net/juju-core/agent/tools"
 	"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"
 	jc "launchpad.net/juju-core/testing/checkers"
 	"launchpad.net/juju-core/version"
@@ -62,7 +62,7 @@
 
 	series := "series"
 	nonce := "fake-nonce"
-	tools := &state.Tools{
+	tools := &tools.Tools{
 		Binary: version.MustParseBinary("2.3.4-foo-bar"),
 		URL:    "http://tools.testing.invalid/2.3.4-foo-bar.tgz",
 	}

=== modified file 'environs/azure/customdata_test.go'
--- environs/azure/customdata_test.go	2013-07-17 10:59:59 +0000
+++ environs/azure/customdata_test.go	2013-07-23 21:14:24 +0000
@@ -8,6 +8,7 @@
 
 	gc "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/cloudinit"
 	"launchpad.net/juju-core/state"
@@ -27,7 +28,7 @@
 		MachineId:    machineID,
 		MachineNonce: "gxshasqlnng",
 		DataDir:      dir,
-		Tools:        &state.Tools{URL: "file://" + dir},
+		Tools:        &tools.Tools{URL: "file://" + dir},
 		StateInfo: &state.Info{
 			CACert: []byte(testing.CACert),
 			Addrs:  []string{"127.0.0.1:123"},

=== modified file 'environs/azure/environ.go'
--- environs/azure/environ.go	2013-07-23 17:37:50 +0000
+++ environs/azure/environ.go	2013-07-23 21:14:24 +0000
@@ -10,11 +10,11 @@
 	"time"
 
 	"launchpad.net/gwacl"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"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/state"
 	"launchpad.net/juju-core/state/api"

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2013-07-18 00:17:46 +0000
+++ environs/cloudinit/cloudinit.go	2013-07-23 21:14:24 +0000
@@ -11,6 +11,7 @@
 	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/cloudinit"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
@@ -69,7 +70,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.
@@ -285,7 +286,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)))
 
@@ -328,7 +329,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-19 17:12:37 +0000
+++ environs/cloudinit/cloudinit_test.go	2013-07-23 21:14:24 +0000
@@ -5,8 +5,13 @@
 
 import (
 	"encoding/base64"
+	"regexp"
+	"strings"
+
 	. "launchpad.net/gocheck"
 	"launchpad.net/goyaml"
+
+	"launchpad.net/juju-core/agent/tools"
 	coreCloudinit "launchpad.net/juju-core/cloudinit"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
@@ -16,8 +21,6 @@
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/version"
-	"regexp"
-	"strings"
 )
 
 // Use local suite since this file lives in the ec2 package
@@ -250,8 +253,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),
 	}
@@ -503,7 +506,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/cloudinit_test.go'
--- environs/cloudinit_test.go	2013-07-17 13:19:18 +0000
+++ environs/cloudinit_test.go	2013-07-23 21:14:24 +0000
@@ -9,6 +9,7 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/goyaml"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/cert"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
@@ -100,7 +101,7 @@
 func (*CloudInitSuite) 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/ec2/ec2.go'
--- environs/ec2/ec2.go	2013-07-20 04:49:19 +0000
+++ environs/ec2/ec2.go	2013-07-23 21:14:24 +0000
@@ -9,13 +9,13 @@
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/ec2"
 	"launchpad.net/goamz/s3"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/cloudinit"
 	"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"

=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go	2013-07-15 23:01:31 +0000
+++ environs/jujutest/livetests.go	2013-07-23 21:14:24 +0000
@@ -9,11 +9,11 @@
 	"io"
 	"io/ioutil"
 	. "launchpad.net/gocheck"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/charm"
 	"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"
@@ -546,7 +546,7 @@
 
 type tooler interface {
 	Life() state.Life
-	AgentTools() (*state.Tools, error)
+	AgentTools() (*tools.Tools, error)
 	Refresh() error
 	String() string
 }
@@ -557,7 +557,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{}
@@ -603,7 +603,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 {
@@ -632,7 +632,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/local/environ.go'
--- environs/local/environ.go	2013-07-18 00:17:46 +0000
+++ environs/local/environ.go	2013-07-23 21:14:24 +0000
@@ -14,6 +14,7 @@
 	"time"
 
 	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/container/lxc"
 	"launchpad.net/juju-core/environs"
@@ -454,10 +455,10 @@
 		return fmt.Errorf("No bootstrap tools found")
 	}
 	// unpack the first tools into the agent dir.
-	tools := toolList[0]
-	logger.Debugf("tools: %#v", tools)
+	agentTools := toolList[0]
+	logger.Debugf("tools: %#v", agentTools)
 	// brutally abuse our knowledge of storage to directly open the file
-	toolsUrl, err := url.Parse(tools.URL)
+	toolsUrl, err := url.Parse(agentTools.URL)
 	toolsLocation := filepath.Join(env.config.storageDir(), toolsUrl.Path)
 	logger.Infof("tools location: %v", toolsLocation)
 	toolsFile, err := os.Open(toolsLocation)
@@ -469,12 +470,12 @@
 	// different series.  When the machine agent is started, it will be
 	// looking based on the current series, so we need to override the series
 	// returned in the tools to be the current series.
-	tools.Binary.Series = version.CurrentSeries()
-	err = agent.UnpackTools(dataDir, tools, toolsFile)
+	agentTools.Binary.Series = version.CurrentSeries()
+	err = tools.UnpackTools(dataDir, agentTools, toolsFile)
 
 	machineId := "0" // Always machine 0
 	tag := state.MachineTag(machineId)
-	toolsDir := agent.SharedToolsDir(dataDir, tools.Binary)
+	toolsDir := tools.SharedToolsDir(dataDir, agentTools.Binary)
 	logDir := env.config.logDir()
 	logConfig := "--debug" // TODO(thumper): specify loggo config
 	agent := upstart.MachineAgentUpstartService(

=== modified file 'environs/maas/environ.go'
--- environs/maas/environ.go	2013-07-20 04:49:19 +0000
+++ environs/maas/environ.go	2013-07-23 21:14:24 +0000
@@ -12,11 +12,11 @@
 
 	"launchpad.net/gomaasapi"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"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/state"
 	"launchpad.net/juju-core/state/api"
@@ -211,7 +211,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) {
 	constraintsParams := convertConstraints(cons)
 	var result gomaasapi.JSONObject
 	var err error

=== modified file 'environs/maas/environ_test.go'
--- environs/maas/environ_test.go	2013-07-17 04:57:57 +0000
+++ environs/maas/environ_test.go	2013-07-23 21:14:24 +0000
@@ -9,11 +9,11 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/gomaasapi"
 	"launchpad.net/goyaml"
+	"launchpad.net/juju-core/agent/tools"
 	"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/environs/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/testing"

=== modified file 'environs/openstack/export_test.go'
--- environs/openstack/export_test.go	2013-07-22 00:37:41 +0000
+++ environs/openstack/export_test.go	2013-07-23 21:14:24 +0000
@@ -9,12 +9,12 @@
 	"launchpad.net/goose/identity"
 	"launchpad.net/goose/nova"
 	"launchpad.net/goose/swift"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
 	"launchpad.net/juju-core/environs/jujutest"
-	"launchpad.net/juju-core/environs/tools"
 	"net/http"
 	"strings"
 	"text/template"

=== modified file 'environs/openstack/provider.go'
--- environs/openstack/provider.go	2013-07-23 18:06:33 +0000
+++ environs/openstack/provider.go	2013-07-23 21:14:24 +0000
@@ -14,13 +14,13 @@
 	"launchpad.net/goose/identity"
 	"launchpad.net/goose/nova"
 	"launchpad.net/goose/swift"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/cloudinit"
 	"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"

=== modified file 'environs/testing/storage.go'
--- environs/testing/storage.go	2013-07-02 21:20:53 +0000
+++ environs/testing/storage.go	2013-07-23 21:14:24 +0000
@@ -16,9 +16,9 @@
 
 	gc "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/localstorage"
-	"launchpad.net/juju-core/environs/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-23 21:14:24 +0000
@@ -4,17 +4,18 @@
 package testing
 
 import (
+	"strings"
+
 	. "launchpad.net/gocheck"
+
+	"launchpad.net/juju-core/agent/tools"
 	"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/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 +26,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-07-13 13:14:11 +0000
+++ environs/tools.go	2013-07-23 21:14:24 +0000
@@ -6,11 +6,10 @@
 import (
 	"fmt"
 
+	"launchpad.net/juju-core/agent/tools"
 	"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/version"
 )
 
@@ -120,7 +119,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-07-13 13:14:11 +0000
+++ environs/tools_test.go	2013-07-23 21:14:24 +0000
@@ -6,13 +6,12 @@
 import (
 	. "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"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/state"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/version"
 )
@@ -557,8 +556,8 @@
 
 // fakeToolsForSeries fakes a Tools object with just enough information for
 // testing the handling its OS series.
-func fakeToolsForSeries(series string) *state.Tools {
-	return &state.Tools{Binary: version.Binary{Series: series}}
+func fakeToolsForSeries(series string) *tools.Tools {
+	return &tools.Tools{Binary: version.Binary{Series: series}}
 }
 
 // fakeToolsList fakes a tools.List containing Tools objects for the given

=== modified file 'state/api/params/internal.go'
--- state/api/params/internal.go	2013-07-23 12:45:02 +0000
+++ state/api/params/internal.go	2013-07-23 21:14:24 +0000
@@ -64,7 +64,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-23 09:03:40 +0000
+++ state/api/upgrader/upgrader_test.go	2013-07-23 21:14:24 +0000
@@ -8,6 +8,7 @@
 
 	. "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
@@ -125,7 +126,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-19 16:35:29 +0000
+++ state/apiserver/upgrader/upgrader.go	2013-07-23 21:14:24 +0000
@@ -4,6 +4,7 @@
 package upgrader
 
 import (
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
@@ -136,30 +137,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-11 15:07:11 +0000
+++ state/apiserver/upgrader/upgrader_test.go	2013-07-23 21:14:24 +0000
@@ -6,6 +6,7 @@
 import (
 	. "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/errors"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
@@ -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-17 12:26:52 +0000
+++ state/machine.go	2013-07-23 21:14:24 +0000
@@ -11,6 +11,7 @@
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/txn"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
@@ -60,8 +61,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
@@ -191,7 +192,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)
 	}
@@ -200,7 +201,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-19 09:53:58 +0000
+++ state/machine_test.go	2013-07-23 21:14:24 +0000
@@ -8,6 +8,7 @@
 
 	. "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
@@ -424,7 +425,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"),
 	})
@@ -587,7 +588,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-17 06:03:50 +0000
+++ state/state.go	2013-07-23 21:14:24 +0000
@@ -30,44 +30,11 @@
 	"launchpad.net/juju-core/state/presence"
 	"launchpad.net/juju-core/state/watcher"
 	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/version"
 )
 
 // 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-19 09:53:58 +0000
+++ state/state_test.go	2013-07-23 21:14:24 +0000
@@ -13,6 +13,7 @@
 	"labix.org/v2/mgo/bson"
 	. "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
@@ -1013,7 +1014,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-07-09 10:32:23 +0000
+++ state/tools_test.go	2013-07-23 21:14:24 +0000
@@ -6,9 +6,9 @@
 import (
 	"fmt"
 
-	"labix.org/v2/mgo/bson"
 	. "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing/checkers"
@@ -16,8 +16,8 @@
 )
 
 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
@@ -30,8 +30,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,
 	}
@@ -43,7 +43,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)
@@ -77,36 +77,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-17 12:26:52 +0000
+++ state/unit.go	2013-07-23 21:14:24 +0000
@@ -14,6 +14,7 @@
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/errors"
@@ -76,7 +77,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"`
@@ -168,7 +169,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)
 	}
@@ -177,7 +178,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")

=== added file 'testing/imports.go'
--- testing/imports.go	1970-01-01 00:00:00 +0000
+++ testing/imports.go	2013-07-23 21:14:24 +0000
@@ -0,0 +1,42 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package testing
+
+import (
+	"go/build"
+	"path/filepath"
+	"sort"
+	"strings"
+
+	gc "launchpad.net/gocheck"
+)
+
+// FindJujuCoreImports returns a sorted list of juju-core packages that are
+// imported by the packageName parameter.  The resulting list removes the
+// common prefix "launchpad.net/juju-core/" leaving just the short names.
+func FindJujuCoreImports(c *gc.C, packageName string) []string {
+	var imports []string
+
+	for _, root := range build.Default.SrcDirs() {
+		fullpath := filepath.Join(root, packageName)
+		pkg, err := build.ImportDir(fullpath, 0)
+		if err == nil {
+			imports = pkg.Imports
+			break
+		}
+	}
+	if imports == nil {
+		c.Fatalf(packageName + " not found")
+	}
+
+	var result []string
+	const prefix = "launchpad.net/juju-core/"
+	for _, name := range imports {
+		if strings.HasPrefix(name, prefix) {
+			result = append(result, name[len(prefix):])
+		}
+	}
+	sort.Strings(result)
+	return result
+}

=== modified file 'worker/deployer/simple.go'
--- worker/deployer/simple.go	2013-07-16 06:29:04 +0000
+++ worker/deployer/simple.go	2013-07-23 21:14:24 +0000
@@ -12,6 +12,7 @@
 	"strings"
 
 	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/log/syslog"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
@@ -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.
@@ -176,7 +177,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
 	}
@@ -189,7 +190,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-11 12:14:07 +0000
+++ worker/deployer/simple_test.go	2013-07-23 21:14:24 +0000
@@ -15,6 +15,7 @@
 	. "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing/checkers"
@@ -143,7 +144,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")
@@ -185,8 +186,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-07-15 01:16:52 +0000
+++ worker/provisioner/lxc-broker.go	2013-07-23 21:14:24 +0000
@@ -6,6 +6,7 @@
 import (
 	"launchpad.net/loggo"
 
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/container/lxc"
 	"launchpad.net/juju-core/environs/config"
@@ -18,7 +19,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(lxc.ManagerConfig{Name: "juju"}),
 		config:  config,
@@ -29,7 +30,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-19 08:00:13 +0000
+++ worker/provisioner/lxc-broker_test.go	2013-07-23 21:14:24 +0000
@@ -12,7 +12,7 @@
 
 	. "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/container/lxc"
 	"launchpad.net/juju-core/container/lxc/mock"
@@ -69,7 +69,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.testing.invalid/2.3.4-foo-bar.tgz",
 	}
@@ -160,7 +160,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://testing.invalid/tools"), 0644)

=== modified file 'worker/provisioner/provisioner.go'
--- worker/provisioner/provisioner.go	2013-07-09 11:31:00 +0000
+++ worker/provisioner/provisioner.go	2013-07-23 21:14:24 +0000
@@ -10,7 +10,7 @@
 	"launchpad.net/loggo"
 	"launchpad.net/tomb"
 
-	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/instance"
@@ -176,8 +176,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-07-09 11:31:00 +0000
+++ worker/uniter/tools_test.go	2013-07-23 21:14:24 +0000
@@ -11,7 +11,7 @@
 
 	. "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker/uniter"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
@@ -25,10 +25,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-07-09 11:31:00 +0000
+++ worker/uniter/uniter.go	2013-07-23 21:14:24 +0000
@@ -14,7 +14,7 @@
 
 	"launchpad.net/tomb"
 
-	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	corecharm "launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/charm/hooks"
 	"launchpad.net/juju-core/cmd"
@@ -141,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-07-18 16:31:35 +0000
+++ worker/uniter/uniter_test.go	2013-07-23 21:14:24 +0000
@@ -23,7 +23,7 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/goyaml"
 
-	"launchpad.net/juju-core/agent"
+	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/errors"
@@ -62,7 +62,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")