Make agent/tools and remove state.Tools

environs/local/environ.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package local
 
 import (
         "fmt"
         "io/ioutil"
         "net"
         "net/url"
         "os"
         "path/filepath"
         "sync"
         "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"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/environs/localstorage"
         "launchpad.net/juju-core/instance"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/state/api"
         "launchpad.net/juju-core/upstart"
         "launchpad.net/juju-core/utils"
@@ skipping 420 matching lines @@
         dataDir := env.config.rootDir()
         toolList, err := environs.FindBootstrapTools(env, cons)
         if err != nil {
                 return err
         }
         // ensure we have at least one valid tools
         if len(toolList) == 0 {
                 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)
         defer toolsFile.Close()
         // Again, brutally abuse our knowledge here.
 
         // The tools that FindBootstrapTools has returned us are based on the
         // default series in the config.  However we are running potentially on a
         // 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(
                 env.machineAgentServiceName(),
                 toolsDir, dataDir, logDir, tag, machineId, logConfig, env.config.Type())
         agent.Env["USER"] = env.config.user
         agent.Env["HOME"] = os.Getenv("HOME")
         agent.Env["JUJU_STORAGE_DIR"] = env.config.storageDir()
         agent.Env["JUJU_STORAGE_ADDR"] = env.config.storageAddr()
         agent.Env["JUJU_SHARED_STORAGE_DIR"] = env.config.sharedStorageDir()
@@ skipping 69 matching lines @@
 
         if err := environs.ConfigureBootstrapMachine(
                 st, cons, env.config.rootDir(), jobs, instance.Id(boostrapInstanceId), instance.HardwareCharacteristics{}); err != nil {
                 st.Close()
                 return nil, err
         }
 
         // Return an open state reference.
         return st, nil
 }