New utils/proxy package.

state/api/params/params.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package params
 
 import (
         "bytes"
         "encoding/json"
         "fmt"
 
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/constraints"
         "launchpad.net/juju-core/instance"
-        "launchpad.net/juju-core/juju/osenv"
+        "launchpad.net/juju-core/utils/proxy"
         "launchpad.net/juju-core/utils/ssh"
         "launchpad.net/juju-core/version"
 )
 
 // Entity identifies a single entity.
 type Entity struct {
         Tag string
 }
 
 // Entities identifies multiple entities.
@@ skipping 583 matching lines @@
 type ContainerManagerConfig struct {
         ManagerConfig map[string]string
 }
 
 // ContainerConfig contains information from the environment config that is
 // needed for container cloud-init.
 type ContainerConfig struct {
         ProviderType            string
         AuthorizedKeys          string
         SSLHostnameVerification bool
-        Proxy                   osenv.ProxySettings
-        AptProxy                osenv.ProxySettings
+        Proxy                   proxy.Settings
+        AptProxy                proxy.Settings
 }
 
 // ProvisioningScriptParams contains the parameters for the
 // ProvisioningScript client API call.
 type ProvisioningScriptParams struct {
         MachineId string
         Nonce     string
 
         // DataDir may be "", in which case the default will be used.
         DataDir string
@@ skipping 78 matching lines @@
 
 // EnsureAvailability contains arguments for
 // the EnsureAvailability client API call.
 type EnsureAvailability struct {
         NumStateServers int
         Constraints     constraints.Value
         // Series is the series to associate with new state server machines.
         // If this is empty, then the environment's default series is used.
         Series string
 }