Merge lp:~cmars/juju-core/resolve-cs-series into lp:~go-bot/juju-core/trunk

[Casey Marshall]

Resolve series with charm store in juju client.

For the deploy and upgradecharm commands, when a series is not provided, and a
default-series is not set in the environment config, the client will resolve
the series with the charm store, through the state server. If the client is
working with a 1.16 state server, it will resolve the series directly with the
charm store.

Existing environments will have a default-series, so they should have no
change in series selection.

New environments will continue to support the default-series config setting,
but it can be omitted, and is not set by default.

https://codereview.appspot.com/80280043/

Resolve series with charm store in juju client.

For the deploy and upgradecharm commands, when a series is not provided, and a
default-series is not set in the environment config, the client will resolve
the series with the charm store, through the state server. If the client is
working with a 1.16 state server, it will resolve the series directly with the
charm store.

Existing environments will have a default-series, so they should have no
change in series selection.

New environments will continue to support the default-series config setting,
but it can be omitted, and is not set by default.

https://codereview.appspot.com/80280043/

[Casey Marshall (cmars)]

Reviewers: mp+212755_code.launchpad.net,

Message:
Please take a look.

Description:
Resolve series with charm store in juju client.

For the deploy and upgradecharm commands, when a series is not provided,
and a
default-series is not set in the environment config, the client will
resolve
the series with the charm store, through the state server. If the
client is
working with a 1.16 state server, it will resolve the series directly
with the
charm store.

Existing environments will have a default-series, so they should have no
change in series selection.

New environments will continue to support the default-series config
setting,
but it can be omitted, and is not set by default.

https://code.launchpad.net/~cmars/juju-core/resolve-cs-series/+merge/212755

(do not edit description out of merge proposal)

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

Affected files (+189, -32 lines):
   A [revision details]
   M charm/charm.go
   M charm/charm_test.go
   M cmd/juju/deploy.go
   M cmd/juju/publish.go
   M cmd/juju/upgradecharm.go
   M environs/bootstrap/synctools.go
   M environs/config/config.go
   M juju/testing/conn.go
   M state/api/client.go
   M state/apiserver/client/client.go
   M state/apiserver/client/client_test.go

[Casey Marshall (cmars)]

This is the client-side to support the LTS transition to trusty (LP:
#1290824). It can't land until the charm store update (LP: #1290828) is
deployed into production (expected tomorrow).

In the meantime, I'd much appreciate your feedback & review.

Thanks,
Casey

https://codereview.appspot.com/80280043/

[John A Meinel (jameinel)]

I think we have some common code that should be factored out, and I
think we need to consider how the code will operate with older Juju
server versions, but otherwise I think this looks pretty good.

https://codereview.appspot.com/80280043/diff/1/cmd/juju/deploy.go
File cmd/juju/deploy.go (right):

https://codereview.appspot.com/80280043/diff/1/cmd/juju/deploy.go#newcode155
cmd/juju/deploy.go:155: repo, err := charm.InferRepository(ref,
ctx.AbsPath(c.RepoPath))
This feels like stuff that definitely needs to be done, but shouldn't be
done in "cmd/juju/deploy.go" which is a "main" sort of function.
Is there a reason this can't be part of more "library" code and tested
as such?

Specifically it feels like it should be a function that takes the
command line parameter (CharmName) a client and a conf, and returns a
fully qualified charm.URL (or error).

Especially given that you essentially implemented it 2 times in this
file. (at least the code you added below this looks a lot like the code
you added above this).

https://codereview.appspot.com/80280043/diff/1/cmd/juju/upgradecharm.go
File cmd/juju/upgradecharm.go (left):

https://codereview.appspot.com/80280043/diff/1/cmd/juju/upgradecharm.go#oldcode208
cmd/juju/upgradecharm.go:208: }
And here, though this one seems to have a new SpecializeCharmRepo step
that I didn't see before.

https://codereview.appspot.com/80280043/diff/1/cmd/juju/upgradecharm.go
File cmd/juju/upgradecharm.go (right):

https://codereview.appspot.com/80280043/diff/1/cmd/juju/upgradecharm.go#newcode148
cmd/juju/upgradecharm.go:148: }
And implemented again here?

https://codereview.appspot.com/80280043/diff/1/state/api/client.go
File state/api/client.go (right):

https://codereview.appspot.com/80280043/diff/1/state/api/client.go#newcode573
state/api/client.go:573:
We need to also add code to handle the fallback case. What do we do if
you are using juju 1.18 to deploy against a 1.16 server that doesn't
have the ResolveCharm API.

I'm guessing the answer is to print an error of:
  "You must supply a series in your charm URL for juju < 1.18".

Either that, or we see that the ResolveCharm isn't available, and just
issue a warning with something like "server version is too old to
support ResolveCharm (juju <1.18) falling back to default series of
"precise""

To be clear, that compatibility code probably shouldn't be here. But
probably could be in the common helper I was outlining earlier.

https://codereview.appspot.com/80280043/

[Casey Marshall (cmars)]

PTAL. If everything looks ok, I'd still like to run a few more tests
against the deployed charm store update tomorrow, before landing.

Thanks,
Casey

https://codereview.appspot.com/80280043/diff/1/cmd/juju/deploy.go
File cmd/juju/deploy.go (right):

https://codereview.appspot.com/80280043/diff/1/cmd/juju/deploy.go#newcode155
cmd/juju/deploy.go:155: repo, err := charm.InferRepository(ref,
ctx.AbsPath(c.RepoPath))
On 2014/03/26 07:11:17, jameinel wrote:
> This feels like stuff that definitely needs to be done, but shouldn't
be done in
> "cmd/juju/deploy.go" which is a "main" sort of function.
> Is there a reason this can't be part of more "library" code and tested
as such?

> Specifically it feels like it should be a function that takes the
command line
> parameter (CharmName) a client and a conf, and returns a fully
qualified
> charm.URL (or error).

> Especially given that you essentially implemented it 2 times in this
file. (at
> least the code you added below this looks a lot like the code you
added above
> this).

Good call, I've refactored functions to cmd/common.go, shared among
deploy and upgradecharm.

https://codereview.appspot.com/80280043/diff/1/cmd/juju/upgradecharm.go
File cmd/juju/upgradecharm.go (left):

https://codereview.appspot.com/80280043/diff/1/cmd/juju/upgradecharm.go#oldcode208
cmd/juju/upgradecharm.go:208: }
On 2014/03/26 07:11:17, jameinel wrote:
> And here, though this one seems to have a new SpecializeCharmRepo step
that I
> didn't see before.

Done.

https://codereview.appspot.com/80280043/diff/1/cmd/juju/upgradecharm.go
File cmd/juju/upgradecharm.go (right):

https://codereview.appspot.com/80280043/diff/1/cmd/juju/upgradecharm.go#newcode148
cmd/juju/upgradecharm.go:148: }
On 2014/03/26 07:11:17, jameinel wrote:
> And implemented again here?

Done.

https://codereview.appspot.com/80280043/diff/1/state/api/client.go
File state/api/client.go (right):

https://codereview.appspot.com/80280043/diff/1/state/api/client.go#newcode573
state/api/client.go:573:
On 2014/03/26 07:11:17, jameinel wrote:
> We need to also add code to handle the fallback case. What do we do if
you are
> using juju 1.18 to deploy against a 1.16 server that doesn't have the
> ResolveCharm API.

> I'm guessing the answer is to print an error of:
> "You must supply a series in your charm URL for juju < 1.18".

> Either that, or we see that the ResolveCharm isn't available, and just
issue a
> warning with something like "server version is too old to support
ResolveCharm
> (juju <1.18) falling back to default series of "precise""

> To be clear, that compatibility code probably shouldn't be here. But
probably
> could be in the common helper I was outlining earlier.

I decided to warn and fall back on "precise" for <1.18 state servers.
These existing environments will almost certainly already have a
default-series set by their bootstrapping.

I had originally intended to resolve the series directly with the charm
store for that case (since 1.16 hits the charm store directly for other
things), but it seems unlikely that such an environment would benefit
from it.

https://codereview.appspot.com/80280043/

[Casey Marshall (cmars)]

Please take a look.

https://codereview.appspot.com/80280043/

[Casey Marshall (cmars)]

The necessary charm store updates to support this change have been
deployed to store.juju.ubuntu.com.

It is safe to land this branch now, waiting for your review.

https://codereview.appspot.com/80280043/

[William Reade (fwereade)]

A few issues -- don't think any of them should be too much hassle to
resolve, the DefaultSeries return value and the API bulk call thing
should both be pretty mechanical.

https://codereview.appspot.com/80280043/diff/20001/cmd/juju/common.go
File cmd/juju/common.go (right):

https://codereview.appspot.com/80280043/diff/20001/cmd/juju/common.go#newcode82
cmd/juju/common.go:82: logger.Warningf(`ResolveCharm not supported by
the API server, falling back to default series "precise".`)
We should in fact be guaranteed a value given a 1.16 state server, but I
heartily endorse this behaviour all the same.

https://codereview.appspot.com/80280043/diff/20001/environs/config/config.go
File environs/config/config.go (left):

https://codereview.appspot.com/80280043/diff/20001/environs/config/config.go#oldcode411
environs/config/config.go:411: func (c *Config) DefaultSeries() string {
In-band errors squick me out... now that it's possible to have no
default-series, please add a ,ok return value. And I guess return false
if it *is* set, but is set to "".

https://codereview.appspot.com/80280043/diff/20001/state/api/client.go
File state/api/client.go (right):

https://codereview.appspot.com/80280043/diff/20001/state/api/client.go#newcode614
state/api/client.go:614: args := params.CharmURL{URL: ref.String()}
mmmmm I don't quite like that... can we make this a separate type?
params.CharmURL now means something different (although I'm surprised, a
little... I could have sworn that charm url fields marshalled to strings
without any hassle at all [0], and so I'd expect us to be using actual
*charm.URLs, and to have to add a new type for a reference anyway.)

[0] yeah, they should do, they have MarshalJSON and UnmarshalJSON.
Wonder why wedon't make use of it...

https://codereview.appspot.com/80280043/diff/20001/state/api/client.go#newcode616
state/api/client.go:616: if err := c.st.Call("Client", "",
"ResolveCharm", args, result); err != nil {
Bulk calls please, they don't have to be exposed in api.Client but it's
reasonable to expect to be able to resolve a few urls in one go, and we
should accommodate that in the interface.

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client.go
File state/apiserver/client/client.go (right):

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client.go#newcode959
state/apiserver/client/client.go:959: ref, series, err :=
charm.ParseReference(args.URL)
yeah, calling it URL is jarring -- new type OK?

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client_test.go
File state/apiserver/client/client_test.go (right):

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client_test.go#newcode1977
state/apiserver/client/client_test.go:1977: store.DefaultSeries =
t.defaultSeries
set this outside loop?

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client_test.go#newcode1979
state/apiserver/client/client_test.go:1979: comment :=
gc.Commentf("defaultSeries:%s charmName:%s", t.defaultSeries,
t.charmName)
for i, test := range tests {
     c.Logf("test %d: %#v", i, test)

...is a reasonably compact way to make the t...

[Casey Marshall (cmars)]

Please take a look.

https://codereview.appspot.com/80280043/

[Casey Marshall (cmars)]

https://codereview.appspot.com/80280043/diff/20001/environs/config/config.go
File environs/config/config.go (left):

https://codereview.appspot.com/80280043/diff/20001/environs/config/config.go#oldcode411
environs/config/config.go:411: func (c *Config) DefaultSeries() string {
On 2014/03/28 10:43:11, fwereade wrote:
> In-band errors squick me out... now that it's possible to have no
> default-series, please add a ,ok return value. And I guess return
false if it
> *is* set, but is set to "".

Done.

https://codereview.appspot.com/80280043/diff/20001/state/api/client.go
File state/api/client.go (right):

https://codereview.appspot.com/80280043/diff/20001/state/api/client.go#newcode614
state/api/client.go:614: args := params.CharmURL{URL: ref.String()}
On 2014/03/28 10:43:11, fwereade wrote:
> mmmmm I don't quite like that... can we make this a separate type?
> params.CharmURL now means something different (although I'm surprised,
a
> little... I could have sworn that charm url fields marshalled to
strings without
> any hassle at all [0], and so I'd expect us to be using actual
*charm.URLs, and
> to have to add a new type for a reference anyway.)

> [0] yeah, they should do, they have MarshalJSON and UnmarshalJSON.
Wonder why
> wedon't make use of it...

Done.

https://codereview.appspot.com/80280043/diff/20001/state/api/client.go#newcode616
state/api/client.go:616: if err := c.st.Call("Client", "",
"ResolveCharm", args, result); err != nil {
On 2014/03/28 10:43:11, fwereade wrote:
> Bulk calls please, they don't have to be exposed in api.Client but
it's
> reasonable to expect to be able to resolve a few urls in one go, and
we should
> accommodate that in the interface.

Done.

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client.go
File state/apiserver/client/client.go (right):

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client.go#newcode959
state/apiserver/client/client.go:959: ref, series, err :=
charm.ParseReference(args.URL)
On 2014/03/28 10:43:11, fwereade wrote:
> yeah, calling it URL is jarring -- new type OK?

Done.

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client_test.go
File state/apiserver/client/client_test.go (right):

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client_test.go#newcode1977
state/apiserver/client/client_test.go:1977: store.DefaultSeries =
t.defaultSeries
On 2014/03/28 10:43:11, fwereade wrote:
> set this outside loop?

Varying the default series in the mock charm store among the test
conditions helps ensure the value isn't being hard-coded anywhere in the
apiserver, and it's useful for simulating a failure to resolve.

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client_test.go#newcode1979
state/apiserver/client/client_test.go:1979: comment :=
gc.Commentf("defaultSeries:%s charmName:%s", t.defaultSeries,
t.charmName)
On 2014/03/28 10:43:11, fwereade wrote:
> for i, test := range tests {
> c.Logf("test %d: %#v", i, test)

> ...is a reasonably compact way to make the test logs somewhat useful.

> I do really like calling it "test", not "t", though :).

Done.

https...

[Casey Marshall (cmars)]

Please take a look.

https://codereview.appspot.com/80280043/

[William Reade (fwereade)]

Nearly there -- a quibble with the location of the PreferredSeries code,
and a bit of work on the API.

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client_test.go
File state/apiserver/client/client_test.go (right):

https://codereview.appspot.com/80280043/diff/20001/state/apiserver/client/client_test.go#newcode1977
state/apiserver/client/client_test.go:1977: store.DefaultSeries =
t.defaultSeries
On 2014/03/31 19:57:07, cmars wrote:
> On 2014/03/28 10:43:11, fwereade wrote:
> > set this outside loop?

> Varying the default series in the mock charm store among the test
conditions
> helps ensure the value isn't being hard-coded anywhere in the
apiserver, and
> it's useful for simulating a failure to resolve.

Ofc, thanks. I think my eye slipped over the `t.` -- but it's much
harder to miss the `test.`. Thanks :).

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/addmachine.go
File cmd/juju/addmachine.go (right):

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/addmachine.go#newcode129
cmd/juju/addmachine.go:129: series = conf.PreferredSeries()
mm, I rather liked the PreferredSeries(conf) spelling, especially if it
were using an interface with just the DefaultSeries method. This doesn't
feel fundamental to a config -- does that seem sane?

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/common.go
File cmd/juju/common.go (right):

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/common.go#newcode82
cmd/juju/common.go:82: logger.Warningf(`ResolveCharm not supported by
the API server, falling back to default series "precise".`)
PreferredSeries should surely be guaranteed to return non-""?

https://codereview.appspot.com/80280043/diff/60001/environs/config/config.go
File environs/config/config.go (right):

https://codereview.appspot.com/80280043/diff/60001/environs/config/config.go#newcode230
environs/config/config.go:230: return DefaultSeries
How do we determine the value of this? I'm feeling like it really ought
to actually *be* the latest LTS, rather than just some global var set by
who-knows-who.

https://codereview.appspot.com/80280043/diff/60001/state/api/params/params.go
File state/api/params/params.go (right):

https://codereview.appspot.com/80280043/diff/60001/state/api/params/params.go#newcode338
state/api/params/params.go:338: URLs []charm.URL
I think we need an error per-result here, don't we?

https://codereview.appspot.com/80280043/diff/60001/state/apiserver/client/client.go
File state/apiserver/client/client.go (right):

https://codereview.appspot.com/80280043/diff/60001/state/apiserver/client/client.go#newcode963
state/apiserver/client/client.go:963: return
params.ResolveCharmResults{}, err
sorry for the hassle, but we should always return one result per
request, and that result should contain either the answer or the error.

Client is a dog's dinner in this regard, and can only gradually and
incrementally improve, but the internal APIs are generally written as I
want them, and should be used as a model. The core idea is that bulk
APIs can be used for single calls, but single APIs can't be used in
bulk; as humans we are bad at predicting the future, and I'd r...

[Casey Marshall (cmars)]

Thanks for reviewing. Couple of questions:

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/addmachine.go
File cmd/juju/addmachine.go (right):

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/addmachine.go#newcode129
cmd/juju/addmachine.go:129: series = conf.PreferredSeries()
On 2014/04/01 07:10:07, fwereade wrote:
> mm, I rather liked the PreferredSeries(conf) spelling, especially if
it were
> using an interface with just the DefaultSeries method. This doesn't
feel
> fundamental to a config -- does that seem sane?

Will do. Should this live in environs/config or a different package?

https://codereview.appspot.com/80280043/diff/60001/environs/config/config.go
File environs/config/config.go (right):

https://codereview.appspot.com/80280043/diff/60001/environs/config/config.go#newcode230
environs/config/config.go:230: return DefaultSeries
On 2014/04/01 07:10:07, fwereade wrote:
> How do we determine the value of this? I'm feeling like it really
ought to
> actually *be* the latest LTS, rather than just some global var set by
> who-knows-who.

I can try to get this from 'distro-info --lts'. If that fails to exec,
I'll use a hard-coded fallback (named as such). What do you think?

https://codereview.appspot.com/80280043/

[Casey Marshall (cmars)]

Please take a look.

https://codereview.appspot.com/80280043/

[Casey Marshall (cmars)]

I've addressed most of the feedback, but there is a problem lurking.
When config.LatestLtsSeries() == "trusty", some of the tests are failing
due to tools availability. I was able to resolve some of them, but not
all. Could really use some advice.

To reproduce the failures, this will simulate a post-trusty release
scenario in the proposed branch:

go test -ldflags "-X
launchpad.net/juju-core/environs/config.latestLtsSeries trusty" ./...

These are the failures:

FAIL: bootstrap_test.go:506:
BootstrapSuite.TestAutoUploadAfterFailedSync
FAIL: bootstrap_test.go:555:
BootstrapSuite.TestMissingToolsUploadFailedError
FAIL: upgradejuju_test.go:301: UpgradeJujuSuite.TestUpgradeJuju
FAIL: imagemetadata_test.go:141:
ImageMetadataSuite.TestImageMetadataFilesDefaultSeries

Everything passes when the latest LTS is precise.

Please advise,
Casey

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/addmachine.go
File cmd/juju/addmachine.go (right):

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/addmachine.go#newcode129
cmd/juju/addmachine.go:129: series = conf.PreferredSeries()
On 2014/04/01 07:10:07, fwereade wrote:
> mm, I rather liked the PreferredSeries(conf) spelling, especially if
it were
> using an interface with just the DefaultSeries method. This doesn't
feel
> fundamental to a config -- does that seem sane?

Done.

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/common.go
File cmd/juju/common.go (right):

https://codereview.appspot.com/80280043/diff/60001/cmd/juju/common.go#newcode82
cmd/juju/common.go:82: logger.Warningf(`ResolveCharm not supported by
the API server, falling back to default series "precise".`)
On 2014/04/01 07:10:07, fwereade wrote:
> PreferredSeries should surely be guaranteed to return non-""?

Done.

https://codereview.appspot.com/80280043/diff/60001/environs/config/config.go
File environs/config/config.go (right):

https://codereview.appspot.com/80280043/diff/60001/environs/config/config.go#newcode230
environs/config/config.go:230: return DefaultSeries
On 2014/04/01 15:05:12, cmars wrote:
> On 2014/04/01 07:10:07, fwereade wrote:
> > How do we determine the value of this? I'm feeling like it really
ought to
> > actually *be* the latest LTS, rather than just some global var set
by
> > who-knows-who.

> I can try to get this from 'distro-info --lts'. If that fails to exec,
I'll use
> a hard-coded fallback (named as such). What do you think?

Done.

https://codereview.appspot.com/80280043/diff/60001/state/api/params/params.go
File state/api/params/params.go (right):

https://codereview.appspot.com/80280043/diff/60001/state/api/params/params.go#newcode338
state/api/params/params.go:338: URLs []charm.URL
On 2014/04/01 07:10:07, fwereade wrote:
> I think we need an error per-result here, don't we?

Done.

https://codereview.appspot.com/80280043/diff/60001/state/apiserver/client/client.go
File state/apiserver/client/client.go (right):

https://codereview.appspot.com/80280043/diff/60001/state/apiserver/client/client.go#newcode963
state/apiserver/client/client.go:963: return
params.ResolveCharmResults{}, err
On 2014/04/01 07:10:07, fwereade wrote:
> sorry for the hassle, but we should always return ...

[Casey Marshall (cmars)]

Please take a look.

https://codereview.appspot.com/80280043/

[Casey Marshall (cmars)]

Tests affected by the LTS change wrt uploading tools are now all passing
when the latest LTS series is "trusty". To run the tests as if trusty
were already released, run with:

go test -ldflags "-X
launchpad.net/juju-core/environs/config.latestLtsSeries trusty"

(This var is normally initialized when not set, from `distro-info
--lts`)

Added wallyworld. I could use a review from a tools distribution
perspective, as this is an area I am only superficially familiar with.
They were affected by the LTS series change so I've tried to make fixes
where test cases and setup had "precise" hardcoded, did not anticipate
having to upload tools other than a DefaultSeries, etc.

Thanks!
-Casey

https://codereview.appspot.com/80280043/

[Casey Marshall (cmars)]

Please take a look.

https://codereview.appspot.com/80280043/

[Ian Booth (wallyworld)]

I think the tools changes are ok. What I like is that when we start
running the tests on a trusty host, the test set up will, where
relevant, continue to correctly use a series matching the host of which
the tests are running, hence replicating the current test behaviour.
Having said that, I still fear our test coverage of the various
permutations in this area is not complete, but that's outside the scope
of this branch. There's still the possibility of perhaps a subtle bug
being introduced with regard to series handling, as has been seen before
when this sort of this was tweaked, but it's hard to know for sure.

https://codereview.appspot.com/80280043/

[William Reade (fwereade)]

Looks good, would appreciate at least a short chat before landing -- in
particular, I'm not quite clear on the forces that lead us to use
FakeDefaultSeries sometimes, and LatestLts at others.

https://codereview.appspot.com/80280043/diff/120001/cmd/juju/bootstrap_test.go
File cmd/juju/bootstrap_test.go (right):

https://codereview.appspot.com/80280043/diff/120001/cmd/juju/bootstrap_test.go#newcode123
cmd/juju/bootstrap_test.go:123: useVersion :=
strings.Replace(test.version, "%LTS%", config.LatestLtsSeries(), 1)
not quite sure that config is the right package for these -- but I'm not
sure I can think of a better one. Unless you want to create a tiny,
hyper-focused, series package somewhere? I'm sure it'll grow excitingly
as we deal with other OSs...

https://codereview.appspot.com/80280043/diff/120001/cmd/juju/upgradecharm.go
File cmd/juju/upgradecharm.go (right):

https://codereview.appspot.com/80280043/diff/120001/cmd/juju/upgradecharm.go#newcode209
cmd/juju/upgradecharm.go:209: repo, err :=
charm.InferRepository(newURL.Reference, c.RepoPath)
We still need ctx.AbsPath, I think. Would you change the relevant test
to use a path relative to the working dir so we check this properly
please?

https://codereview.appspot.com/80280043/diff/120001/environs/config/config.go
File environs/config/config.go (right):

https://codereview.appspot.com/80280043/diff/120001/environs/config/config.go#newcode106
environs/config/config.go:106:
yeah, this feels a bit tacked-on here. Let's give it its own package if
we don't think of anywhere better.

https://codereview.appspot.com/80280043/diff/120001/environs/config/config.go#newcode456
environs/config/config.go:456: series := s.(string)
this is guaranteed to be a string if it's got this far, right?

https://codereview.appspot.com/80280043/diff/120001/provider/common/bootstrap.go
File provider/common/bootstrap.go (right):

https://codereview.appspot.com/80280043/diff/120001/provider/common/bootstrap.go#newcode45
provider/common/bootstrap.go:45: selectedTools, err :=
EnsureBootstrapTools(ctx, env, config.PreferredSeries(env.Config()),
cons.Arch)
quibble quibble, we should probably allow bootstrap on any series we can
find tools for. Out of scope today, but maybe worth a bug?

https://codereview.appspot.com/80280043/diff/120001/provider/ec2/ec2.go
File provider/ec2/ec2.go (right):

https://codereview.appspot.com/80280043/diff/120001/provider/ec2/ec2.go#newcode367
provider/ec2/ec2.go:367: Series:
config.PreferredSeries(e.ecfg()),
this seems a bit weird, but so did the original. let it stand.

https://codereview.appspot.com/80280043/diff/120001/provider/ec2/live_test.go
File provider/ec2/live_test.go (right):

https://codereview.appspot.com/80280043/diff/120001/provider/ec2/live_test.go#newcode104
provider/ec2/live_test.go:104: Series: coretesting.FakeDefaultSeries,
wondering if this should be LatestLts? I presume you have a good reason
it isn't, but it's not immediately clear ;)

https://codereview.appspot.com/80280043/diff/120001/state/api/client.go
File state/api/client.go (right):

https://codereview.appspot.com/80280043/diff/120001/state/api/client.go#newcode613
state/api/client.go:613: func (c *Client) Resolv...

[Casey Marshall (cmars)]

PTAL

https://codereview.appspot.com/80280043/diff/120001/cmd/juju/bootstrap_test.go
File cmd/juju/bootstrap_test.go (right):

https://codereview.appspot.com/80280043/diff/120001/cmd/juju/bootstrap_test.go#newcode123
cmd/juju/bootstrap_test.go:123: useVersion :=
strings.Replace(test.version, "%LTS%", config.LatestLtsSeries(), 1)
On 2014/04/03 13:34:15, fwereade wrote:
> not quite sure that config is the right package for these -- but I'm
not sure I
> can think of a better one. Unless you want to create a tiny,
hyper-focused,
> series package somewhere? I'm sure it'll grow excitingly as we deal
with other
> OSs...

LP: #1301999

https://codereview.appspot.com/80280043/diff/120001/cmd/juju/upgradecharm.go
File cmd/juju/upgradecharm.go (right):

https://codereview.appspot.com/80280043/diff/120001/cmd/juju/upgradecharm.go#newcode209
cmd/juju/upgradecharm.go:209: repo, err :=
charm.InferRepository(newURL.Reference, c.RepoPath)
On 2014/04/03 13:34:15, fwereade wrote:
> We still need ctx.AbsPath, I think. Would you change the relevant test
to use a
> path relative to the working dir so we check this properly please?

Ah, must have botched this in a prior merge. Restored it.

https://codereview.appspot.com/80280043/diff/120001/environs/config/config.go
File environs/config/config.go (right):

https://codereview.appspot.com/80280043/diff/120001/environs/config/config.go#newcode106
environs/config/config.go:106:
On 2014/04/03 13:34:15, fwereade wrote:
> yeah, this feels a bit tacked-on here. Let's give it its own package
if we don't
> think of anywhere better.

LP: #1301999

https://codereview.appspot.com/80280043/diff/120001/environs/config/config.go#newcode456
environs/config/config.go:456: series := s.(string)
On 2014/04/03 13:34:15, fwereade wrote:
> this is guaranteed to be a string if it's got this far, right?

Non-string values that make their way in here will be ignored with a
warning.

https://codereview.appspot.com/80280043/diff/120001/provider/common/bootstrap.go
File provider/common/bootstrap.go (right):

https://codereview.appspot.com/80280043/diff/120001/provider/common/bootstrap.go#newcode45
provider/common/bootstrap.go:45: selectedTools, err :=
EnsureBootstrapTools(ctx, env, config.PreferredSeries(env.Config()),
cons.Arch)
On 2014/04/03 13:34:15, fwereade wrote:
> quibble quibble, we should probably allow bootstrap on any series we
can find
> tools for. Out of scope today, but maybe worth a bug?

LP: #1302005

https://codereview.appspot.com/80280043/diff/120001/provider/ec2/live_test.go
File provider/ec2/live_test.go (right):

https://codereview.appspot.com/80280043/diff/120001/provider/ec2/live_test.go#newcode104
provider/ec2/live_test.go:104: Series: coretesting.FakeDefaultSeries,
On 2014/04/03 13:34:15, fwereade wrote:
> wondering if this should be LatestLts? I presume you have a good
reason it
> isn't, but it's not immediately clear ;)

It's to separate what is used for default-series: in tests from the
preferred series selection. This allows us to test scenarios against
different configured series vs. what will be preferred.

Most of what's affected atm is the tools setup & bootstrapping for some
tests. There are still some areas ...

[William Reade (fwereade)]

LGTM with one trivial. Thanks for this, it's a monster diff -- let's
throw it at CI and see what we've missed ;).

https://codereview.appspot.com/80280043/diff/140001/charm/url_test.go
File charm/url_test.go (right):

https://codereview.appspot.com/80280043/diff/140001/charm/url_test.go#newcode292
charm/url_test.go:292: c.Check(parsed, gc.DeepEquals, ref)
add one for unmarshalling gibberish, just for safety's sake

https://codereview.appspot.com/80280043/

=== modified file 'charm/charm.go'
--- charm/charm.go	2014-03-17 18:46:17 +0000
+++ charm/charm.go	2014-04-03 17:37:27 +0000
@@ -30,10 +30,10 @@
 	return ReadBundle(path)
 }
 
-// InferRepository returns a charm repository inferred from
-// the provided URL. Local URLs will use the provided path.
-func InferRepository(curl *URL, localRepoPath string) (repo Repository, err error) {
-	switch curl.Schema {
+// InferRepository returns a charm repository inferred from the provided charm
+// reference. Local references will use the provided path.
+func InferRepository(ref Reference, localRepoPath string) (repo Repository, err error) {
+	switch ref.Schema {
 	case "cs":
 		repo = Store
 	case "local":
@@ -42,7 +42,7 @@
 		}
 		repo = &LocalRepository{Path: localRepoPath}
 	default:
-		return nil, fmt.Errorf("unknown schema for charm URL %q", curl)
+		return nil, fmt.Errorf("unknown schema for charm reference %q", ref)
 	}
 	return
 }

=== modified file 'charm/charm_test.go'
--- charm/charm_test.go	2014-03-18 05:08:25 +0000
+++ charm/charm_test.go	2014-04-03 17:37:27 +0000
@@ -48,7 +48,7 @@
 		c.Logf("test %d", i)
 		curl, err := charm.InferURL(t.url, "precise")
 		c.Assert(err, gc.IsNil)
-		repo, err := charm.InferRepository(curl, "/some/path")
+		repo, err := charm.InferRepository(curl.Reference, "/some/path")
 		c.Assert(err, gc.IsNil)
 		switch repo := repo.(type) {
 		case *charm.LocalRepository:
@@ -59,11 +59,11 @@
 	}
 	curl, err := charm.InferURL("local:whatever", "precise")
 	c.Assert(err, gc.IsNil)
-	_, err = charm.InferRepository(curl, "")
+	_, err = charm.InferRepository(curl.Reference, "")
 	c.Assert(err, gc.ErrorMatches, "path to local repository not specified")
 	curl.Schema = "foo"
-	_, err = charm.InferRepository(curl, "")
-	c.Assert(err, gc.ErrorMatches, "unknown schema for charm URL.*")
+	_, err = charm.InferRepository(curl.Reference, "")
+	c.Assert(err, gc.ErrorMatches, "unknown schema for charm reference.*")
 }
 
 func checkDummy(c *gc.C, f charm.Charm, path string) {

=== modified file 'charm/url.go'
--- charm/url.go	2014-03-24 15:35:41 +0000
+++ charm/url.go	2014-04-03 17:37:27 +0000
@@ -284,8 +284,6 @@
 	return nil
 }
 
-var jsonNull = []byte("null")
-
 func (u *URL) MarshalJSON() ([]byte, error) {
 	if u == nil {
 		panic("cannot marshal nil *charm.URL")
@@ -306,6 +304,23 @@
 	return nil
 }
 
+func (r *Reference) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.String())
+}
+
+func (r *Reference) UnmarshalJSON(b []byte) error {
+	var s string
+	if err := json.Unmarshal(b, &s); err != nil {
+		return err
+	}
+	ref, _, err := ParseReference(s)
+	if err != nil {
+		return err
+	}
+	*r = ref
+	return nil
+}
+
 // Quote translates a charm url string into one which can be safely used
 // in a file path.  ASCII letters, ASCII digits, dot and dash stay the
 // same; other characters are translated to their hex representation

=== modified file 'charm/url_test.go'
--- charm/url_test.go	2014-03-24 15:35:41 +0000
+++ charm/url_test.go	2014-04-03 17:37:27 +0000
@@ -258,7 +258,7 @@
 	Unmarshal: json.Unmarshal,
 }}
 
-func (s *URLSuite) TestCodecs(c *gc.C) {
+func (s *URLSuite) TestURLCodecs(c *gc.C) {
 	for i, codec := range codecs {
 		c.Logf("codec %d", i)
 		type doc struct {
@@ -279,6 +279,25 @@
 	}
 }
 
+func (s *URLSuite) TestReferenceJSON(c *gc.C) {
+	ref, _, err := charm.ParseReference("cs:series/name")
+	c.Assert(err, gc.IsNil)
+	data, err := json.Marshal(&ref)
+	c.Assert(err, gc.IsNil)
+	c.Check(string(data), gc.Equals, `"cs:name"`)
+
+	var parsed charm.Reference
+	err = json.Unmarshal(data, &parsed)
+	c.Assert(err, gc.IsNil)
+	c.Check(parsed, gc.DeepEquals, ref)
+
+	// unmarshalling json gibberish and invalid charm reference strings
+	for _, value := range []string{":{", `"cs:{}+<"`, `"cs:~_~/f00^^&^/baaaar$%-?"`} {
+		err = json.Unmarshal([]byte(value), &parsed)
+		c.Check(err, gc.NotNil)
+	}
+}
+
 type QuoteSuite struct{}
 
 var _ = gc.Suite(&QuoteSuite{})

=== modified file 'cmd/juju/addmachine.go'
--- cmd/juju/addmachine.go	2014-04-01 04:53:43 +0000
+++ cmd/juju/addmachine.go	2014-04-03 17:37:27 +0000
@@ -12,6 +12,7 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/manual"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
@@ -131,7 +132,7 @@
 		if err != nil {
 			return "", err
 		}
-		series = conf.DefaultSeries()
+		series = config.PreferredSeries(conf)
 	}
 	template := state.MachineTemplate{
 		Series:      series,

=== modified file 'cmd/juju/bootstrap_test.go'
--- cmd/juju/bootstrap_test.go	2014-04-01 03:11:16 +0000
+++ cmd/juju/bootstrap_test.go	2014-04-03 17:37:27 +0000
@@ -15,6 +15,7 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/imagemetadata"
@@ -119,7 +120,8 @@
 func (s *BootstrapSuite) runAllowRetriesTest(c *gc.C, test bootstrapRetryTest) {
 	toolsVersions := envtesting.VAll
 	if test.version != "" {
-		testVersion := version.MustParseBinary(test.version)
+		useVersion := strings.Replace(test.version, "%LTS%", config.LatestLtsSeries(), 1)
+		testVersion := version.MustParseBinary(useVersion)
 		s.PatchValue(&version.Current, testVersion)
 		if test.addVersionToSource {
 			toolsVersions = append([]version.Binary{}, toolsVersions...)
@@ -201,8 +203,9 @@
 	defer fake.Restore()
 
 	if test.version != "" {
+		useVersion := strings.Replace(test.version, "%LTS%", config.LatestLtsSeries(), 1)
 		origVersion := version.Current
-		version.Current = version.MustParseBinary(test.version)
+		version.Current = version.MustParseBinary(useVersion)
 		defer func() { version.Current = origVersion }()
 	}
 
@@ -217,7 +220,7 @@
 	uploadCount := len(test.uploads)
 	if uploadCount == 0 {
 		usefulVersion := version.Current
-		usefulVersion.Series = env.Config().DefaultSeries()
+		usefulVersion.Series = config.PreferredSeries(env.Config())
 		envtesting.AssertUploadFakeToolsVersions(c, env.Storage(), usefulVersion)
 	}
 
@@ -245,6 +248,7 @@
 		urls := list.URLs()
 		c.Check(urls, gc.HasLen, len(test.uploads))
 		for _, v := range test.uploads {
+			v := strings.Replace(v, "%LTS%", config.LatestLtsSeries(), 1)
 			c.Logf("seeking: " + v)
 			vers := version.MustParseBinary(v)
 			_, found := urls[vers]
@@ -299,10 +303,9 @@
 	args: []string{"--series", "fine"},
 	err:  `--series requires --upload-tools`,
 }, {
-	info:    "bad environment",
-	version: "1.2.3-precise-amd64",
-	args:    []string{"-e", "brokenenv"},
-	err:     `dummy.Bootstrap is broken`,
+	info: "bad environment",
+	args: []string{"-e", "brokenenv"},
+	err:  `dummy.Bootstrap is broken`,
 }, {
 	info:        "constraints",
 	args:        []string{"--constraints", "mem=4G cpu-cores=4"},
@@ -312,9 +315,9 @@
 	version: "1.2.3-saucy-amd64",
 	args:    []string{"--upload-tools"},
 	uploads: []string{
-		"1.2.3.1-saucy-amd64",   // from version.Current
-		"1.2.3.1-raring-amd64",  // from env.Config().DefaultSeries()
-		"1.2.3.1-precise-amd64", // from environs/config.DefaultSeries
+		"1.2.3.1-saucy-amd64",  // from version.Current
+		"1.2.3.1-raring-amd64", // from env.Config().DefaultSeries()
+		"1.2.3.1-%LTS%-amd64",  // from environs/config.DefaultSeries
 	},
 }, {
 	info:     "--upload-tools uses arch from constraint if it matches current version",
@@ -322,18 +325,18 @@
 	hostArch: "ppc64",
 	args:     []string{"--upload-tools", "--constraints", "arch=ppc64"},
 	uploads: []string{
-		"1.3.3.1-saucy-ppc64",   // from version.Current
-		"1.3.3.1-raring-ppc64",  // from env.Config().DefaultSeries()
-		"1.3.3.1-precise-ppc64", // from environs/config.DefaultSeries
+		"1.3.3.1-saucy-ppc64",  // from version.Current
+		"1.3.3.1-raring-ppc64", // from env.Config().DefaultSeries()
+		"1.3.3.1-%LTS%-ppc64",  // from environs/config.DefaultSeries
 	},
 	constraints: constraints.MustParse("arch=ppc64"),
 }, {
 	info:    "--upload-tools only uploads each file once",
-	version: "1.2.3-precise-amd64",
+	version: "1.2.3-%LTS%-amd64",
 	args:    []string{"--upload-tools"},
 	uploads: []string{
 		"1.2.3.1-raring-amd64",
-		"1.2.3.1-precise-amd64",
+		"1.2.3.1-%LTS%-amd64",
 	},
 }, {
 	info:    "--upload-tools rejects invalid series",
@@ -357,7 +360,7 @@
 	args:    []string{"--upload-tools"},
 	uploads: []string{
 		"1.2.3.5-raring-amd64",
-		"1.2.3.5-precise-amd64",
+		"1.2.3.5-%LTS%-amd64",
 	},
 }}
 
@@ -365,7 +368,7 @@
 	env, fake := makeEmptyFakeHome(c)
 	defer fake.Restore()
 	defaultSeriesVersion := version.Current
-	defaultSeriesVersion.Series = env.Config().DefaultSeries()
+	defaultSeriesVersion.Series = config.PreferredSeries(env.Config())
 
 	ctx := coretesting.Context(c)
 	code := cmd.Main(&BootstrapCommand{}, ctx, nil)
@@ -383,7 +386,7 @@
 	env, fake := makeEmptyFakeHome(c)
 	defer fake.Restore()
 	defaultSeriesVersion := version.Current
-	defaultSeriesVersion.Series = env.Config().DefaultSeries()
+	defaultSeriesVersion.Series = config.PreferredSeries(env.Config())
 
 	store, err := configstore.Default()
 	c.Assert(err, gc.IsNil)
@@ -515,7 +518,13 @@
 	c.Assert(err, gc.IsNil)
 	c.Logf("found: " + list.String())
 	urls := list.URLs()
-	c.Assert(urls, gc.HasLen, 2)
+	expectedUrlCount := 2
+
+	// There will be distinct tools for each of these if they are different
+	if config.LatestLtsSeries() != coretesting.FakeDefaultSeries {
+		expectedUrlCount++
+	}
+	c.Assert(urls, gc.HasLen, expectedUrlCount)
 	expectedVers := []version.Binary{
 		version.MustParseBinary(fmt.Sprintf("1.7.3.1-%s-%s", otherSeries, version.Current.Arch)),
 		version.MustParseBinary(fmt.Sprintf("1.7.3.1-%s-%s", version.Current.Series, version.Current.Arch)),
@@ -556,7 +565,11 @@
 	code := cmd.Main(&BootstrapCommand{}, context, nil)
 	c.Assert(code, gc.Equals, 1)
 	errText := context.Stderr.(*bytes.Buffer).String()
-	expectedErrText := "uploading tools for series \\[precise raring\\]\n"
+	expectedErrText := "uploading tools for series \\[precise "
+	if config.LatestLtsSeries() != coretesting.FakeDefaultSeries {
+		expectedErrText += config.LatestLtsSeries() + " "
+	}
+	expectedErrText += "raring\\]\n"
 	expectedErrText += "error: cannot upload bootstrap tools: an error\n"
 	c.Assert(errText, gc.Matches, expectedErrText)
 }

=== modified file 'cmd/juju/common.go'
--- cmd/juju/common.go	2014-03-26 04:36:17 +0000
+++ cmd/juju/common.go	2014-04-03 17:37:27 +0000
@@ -4,10 +4,13 @@
 package main
 
 import (
+	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
 	"launchpad.net/juju-core/errors"
+	"launchpad.net/juju-core/state/api"
 )
 
 // destroyPreparedEnviron destroys the environment and logs an error if it fails.
@@ -45,3 +48,39 @@
 	}
 	return environ, cleanup, nil
 }
+
+// resolveCharmURL returns a resolved charm URL, given a charm location string.
+// If the series is not resolved, the environment default-series is used, or if
+// not set, the series is resolved with the state server.
+func resolveCharmURL(url string, client *api.Client, conf *config.Config) (*charm.URL, error) {
+	ref, series, err := charm.ParseReference(url)
+	if err != nil {
+		return nil, err
+	}
+	// If series is not set, use configured default series
+	if series == "" {
+		if defaultSeries, ok := conf.DefaultSeries(); ok {
+			series = defaultSeries
+		}
+	}
+	// Otherwise, look up the best supported series for this charm
+	if series == "" {
+		return client.ResolveCharm(ref)
+	}
+	return &charm.URL{Reference: ref, Series: series}, nil
+}
+
+// resolveCharmURL1dot16 returns a resolved charm URL for older state servers
+// that do not support ResolveCharm. The default series "precise" is
+// appropriate for these environments.
+func resolveCharmURL1dot16(url string, conf *config.Config) (*charm.URL, error) {
+	ref, series, err := charm.ParseReference(url)
+	if err != nil {
+		return nil, err
+	}
+
+	if series == "" {
+		series = config.PreferredSeries(conf)
+	}
+	return &charm.URL{Reference: ref, Series: series}, err
+}

=== modified file 'cmd/juju/deploy.go'
--- cmd/juju/deploy.go	2014-04-01 14:55:36 +0000
+++ cmd/juju/deploy.go	2014-04-03 17:37:27 +0000
@@ -154,11 +154,13 @@
 	if err != nil {
 		return err
 	}
-	curl, err := charm.InferURL(c.CharmName, conf.DefaultSeries())
+
+	curl, err := resolveCharmURL(c.CharmName, client, conf)
 	if err != nil {
 		return err
 	}
-	repo, err := charm.InferRepository(curl, ctx.AbsPath(c.RepoPath))
+
+	repo, err := charm.InferRepository(curl.Reference, ctx.AbsPath(c.RepoPath))
 	if err != nil {
 		return err
 	}
@@ -260,15 +262,16 @@
 	if err != nil {
 		return err
 	}
-	curl, err := charm.InferURL(c.CharmName, conf.DefaultSeries())
-	if err != nil {
-		return err
-	}
-	repo, err := charm.InferRepository(curl, ctx.AbsPath(c.RepoPath))
-	if err != nil {
-		return err
-	}
-
+
+	curl, err := resolveCharmURL1dot16(c.CharmName, conf)
+	if err != nil {
+		return err
+	}
+
+	repo, err := charm.InferRepository(curl.Reference, c.RepoPath)
+	if err != nil {
+		return err
+	}
 	repo = config.SpecializeCharmRepo(repo, conf)
 
 	// TODO(fwereade) it's annoying to roundtrip the bytes through the client

=== modified file 'cmd/juju/environment_test.go'
--- cmd/juju/environment_test.go	2014-03-26 05:44:41 +0000
+++ cmd/juju/environment_test.go	2014-04-03 17:37:27 +0000
@@ -124,12 +124,22 @@
 }
 
 func (s *SetEnvironmentSuite) TestChangeDefaultSeries(c *gc.C) {
-	_, err := testing.RunCommand(c, &SetEnvironmentCommand{}, []string{"default-series=raring"})
-	c.Assert(err, gc.IsNil)
-
+	// default-series not set
 	stateConfig, err := s.State.EnvironConfig()
 	c.Assert(err, gc.IsNil)
-	c.Assert(stateConfig.DefaultSeries(), gc.Equals, "raring")
+	series, ok := stateConfig.DefaultSeries()
+	c.Assert(ok, gc.Equals, true)
+	c.Assert(series, gc.Equals, "precise") // default-series set in RepoSuite.SetUpTest
+
+	_, err = testing.RunCommand(c, &SetEnvironmentCommand{}, []string{"default-series=raring"})
+	c.Assert(err, gc.IsNil)
+
+	stateConfig, err = s.State.EnvironConfig()
+	c.Assert(err, gc.IsNil)
+	series, ok = stateConfig.DefaultSeries()
+	c.Assert(ok, gc.Equals, true)
+	c.Assert(series, gc.Equals, "raring")
+	c.Assert(config.PreferredSeries(stateConfig), gc.Equals, "raring")
 }
 
 func (s *SetEnvironmentSuite) TestChangeBooleanAttribute(c *gc.C) {

=== modified file 'cmd/juju/publish.go'
--- cmd/juju/publish.go	2014-04-01 04:53:43 +0000
+++ cmd/juju/publish.go	2014-04-03 17:37:27 +0000
@@ -115,7 +115,7 @@
 		pushLocation = c.changePushLocation(pushLocation)
 	}
 
-	repo, err := charm.InferRepository(curl, "/not/important")
+	repo, err := charm.InferRepository(curl.Reference, "/not/important")
 	if err != nil {
 		return err
 	}

=== modified file 'cmd/juju/upgradecharm.go'
--- cmd/juju/upgradecharm.go	2014-04-01 04:53:43 +0000
+++ cmd/juju/upgradecharm.go	2014-04-03 17:37:27 +0000
@@ -134,8 +134,7 @@
 
 	var newURL *charm.URL
 	if c.SwitchURL != "" {
-		// A new charm URL was explicitly specified.
-		newURL, err = charm.InferURL(c.SwitchURL, conf.DefaultSeries())
+		newURL, err = resolveCharmURL(c.SwitchURL, client, conf)
 		if err != nil {
 			return err
 		}
@@ -143,11 +142,11 @@
 		// No new URL specified, but revision might have been.
 		newURL = oldURL.WithRevision(c.Revision)
 	}
-	repo, err := charm.InferRepository(newURL, ctx.AbsPath(c.RepoPath))
+
+	repo, err := charm.InferRepository(newURL.Reference, ctx.AbsPath(c.RepoPath))
 	if err != nil {
 		return err
 	}
-
 	repo = config.SpecializeCharmRepo(repo, conf)
 
 	// If no explicit revision was set with either SwitchURL
@@ -203,11 +202,7 @@
 	var newURL *charm.URL
 	if c.SwitchURL != "" {
 		// A new charm URL was explicitly specified.
-		conf, err := conn.State.EnvironConfig()
-		if err != nil {
-			return err
-		}
-		newURL, err = charm.InferURL(c.SwitchURL, conf.DefaultSeries())
+		newURL, err = resolveCharmURL1dot16(c.SwitchURL, conf)
 		if err != nil {
 			return err
 		}
@@ -215,11 +210,11 @@
 		// No new URL specified, but revision might have been.
 		newURL = oldURL.WithRevision(c.Revision)
 	}
-	repo, err := charm.InferRepository(newURL, ctx.AbsPath(c.RepoPath))
+
+	repo, err := charm.InferRepository(newURL.Reference, ctx.AbsPath(c.RepoPath))
 	if err != nil {
 		return err
 	}
-
 	repo = config.SpecializeCharmRepo(repo, conf)
 
 	// If no explicit revision was set with either SwitchURL

=== modified file 'cmd/juju/upgradejuju_test.go'
--- cmd/juju/upgradejuju_test.go	2014-03-17 06:05:54 +0000
+++ cmd/juju/upgradejuju_test.go	2014-04-03 17:37:27 +0000
@@ -14,6 +14,7 @@
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/storage"
 	"launchpad.net/juju-core/environs/sync"
@@ -225,14 +226,14 @@
 	agentVersion:   "2.0.0",
 	args:           []string{"--upload-tools"},
 	expectVersion:  "2.2.0.1",
-	expectUploaded: []string{"2.2.0.1-quantal-amd64", "2.2.0.1-precise-amd64", "2.2.0.1-raring-amd64"},
+	expectUploaded: []string{"2.2.0.1-quantal-amd64", "2.2.0.1-%LTS%-amd64", "2.2.0.1-raring-amd64"},
 }, {
 	about:          "upload with explicit version",
 	currentVersion: "2.2.0-quantal-amd64",
 	agentVersion:   "2.0.0",
 	args:           []string{"--upload-tools", "--version", "2.7.3"},
 	expectVersion:  "2.7.3.1",
-	expectUploaded: []string{"2.7.3.1-quantal-amd64", "2.7.3.1-precise-amd64", "2.7.3.1-raring-amd64"},
+	expectUploaded: []string{"2.7.3.1-quantal-amd64", "2.7.3.1-%LTS%-amd64", "2.7.3.1-raring-amd64"},
 }, {
 	about:          "upload with explicit series",
 	currentVersion: "2.2.0-quantal-amd64",
@@ -246,7 +247,7 @@
 	agentVersion:   "2.0.0",
 	args:           []string{"--upload-tools"},
 	expectVersion:  "2.1.0.1",
-	expectUploaded: []string{"2.1.0.1-quantal-amd64", "2.1.0.1-precise-amd64", "2.1.0.1-raring-amd64"},
+	expectUploaded: []string{"2.1.0.1-quantal-amd64", "2.1.0.1-%LTS%-amd64", "2.1.0.1-raring-amd64"},
 }, {
 	about:          "upload bumps version when necessary",
 	tools:          []string{"2.4.6-quantal-amd64", "2.4.8-quantal-amd64"},
@@ -254,7 +255,7 @@
 	agentVersion:   "2.4.0",
 	args:           []string{"--upload-tools"},
 	expectVersion:  "2.4.6.1",
-	expectUploaded: []string{"2.4.6.1-quantal-amd64", "2.4.6.1-precise-amd64", "2.4.6.1-raring-amd64"},
+	expectUploaded: []string{"2.4.6.1-quantal-amd64", "2.4.6.1-%LTS%-amd64", "2.4.6.1-raring-amd64"},
 }, {
 	about:          "upload re-bumps version when necessary",
 	tools:          []string{"2.4.6-quantal-amd64", "2.4.6.2-saucy-i386", "2.4.8-quantal-amd64"},
@@ -262,7 +263,7 @@
 	agentVersion:   "2.4.6.2",
 	args:           []string{"--upload-tools"},
 	expectVersion:  "2.4.6.3",
-	expectUploaded: []string{"2.4.6.3-quantal-amd64", "2.4.6.3-precise-amd64", "2.4.6.3-raring-amd64"},
+	expectUploaded: []string{"2.4.6.3-quantal-amd64", "2.4.6.3-%LTS%-amd64", "2.4.6.3-raring-amd64"},
 }, {
 	about:          "upload with explicit version bumps when necessary",
 	currentVersion: "2.2.0-quantal-amd64",
@@ -270,7 +271,7 @@
 	agentVersion:   "2.0.0",
 	args:           []string{"--upload-tools", "--version", "2.7.3"},
 	expectVersion:  "2.7.3.2",
-	expectUploaded: []string{"2.7.3.2-quantal-amd64", "2.7.3.2-precise-amd64", "2.7.3.2-raring-amd64"},
+	expectUploaded: []string{"2.7.3.2-quantal-amd64", "2.7.3.2-%LTS%-amd64", "2.7.3.2-raring-amd64"},
 }}
 
 // getMockBuildTools returns a sync.BuildToolsTarballFunc implementation which generates
@@ -356,6 +357,9 @@
 		c.Check(agentVersion, gc.Equals, version.MustParse(test.expectVersion))
 
 		for _, uploaded := range test.expectUploaded {
+			// Substitute latest LTS for placeholder in expected series for uploaded tools
+			uploaded = strings.Replace(uploaded, "%LTS%", config.LatestLtsSeries(), 1)
+
 			vers := version.MustParseBinary(uploaded)
 			r, err := storage.Get(s.Conn.Environ.Storage(), envtools.StorageName(vers))
 			if !c.Check(err, gc.IsNil) {

=== modified file 'cmd/plugins/juju-metadata/imagemetadata.go'
--- cmd/plugins/juju-metadata/imagemetadata.go	2014-03-28 12:28:30 +0000
+++ cmd/plugins/juju-metadata/imagemetadata.go	2014-04-03 17:37:27 +0000
@@ -97,7 +97,7 @@
 			}
 			cfg := environ.Config()
 			if c.Series == "" {
-				c.Series = cfg.DefaultSeries()
+				c.Series = config.PreferredSeries(cfg)
 			}
 			if v, ok := cfg.AllAttrs()["control-bucket"]; ok {
 				c.privateStorage = v.(string)
@@ -110,7 +110,7 @@
 		logger.Infof("no environment found, creating image metadata using user supplied data")
 	}
 	if c.Series == "" {
-		c.Series = config.DefaultSeries
+		c.Series = config.LatestLtsSeries()
 	}
 	if c.ImageId == "" {
 		return fmt.Errorf("image id must be specified")

=== modified file 'cmd/plugins/juju-metadata/imagemetadata_test.go'
--- cmd/plugins/juju-metadata/imagemetadata_test.go	2014-03-13 07:54:56 +0000
+++ cmd/plugins/juju-metadata/imagemetadata_test.go	2014-04-03 17:37:27 +0000
@@ -15,6 +15,7 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/testbase"
 )
@@ -61,6 +62,7 @@
 var seriesVersions map[string]string = map[string]string{
 	"precise": "12.04",
 	"raring":  "13.04",
+	"trusty":  "14.04",
 }
 
 type expectedMetadata struct {
@@ -138,7 +140,7 @@
 	s.assertCommandOutput(c, expected, out, defaultIndexFileName, defaultImageFileName)
 }
 
-func (s *ImageMetadataSuite) TestImageMetadataFilesDefaultSeries(c *gc.C) {
+func (s *ImageMetadataSuite) TestImageMetadataFilesLatestLts(c *gc.C) {
 	ctx := testing.Context(c)
 	code := cmd.Main(
 		&ImageMetadataCommand{}, ctx, []string{
@@ -146,7 +148,7 @@
 	c.Assert(code, gc.Equals, 0)
 	out := testing.Stdout(ctx)
 	expected := expectedMetadata{
-		series: "precise",
+		series: config.LatestLtsSeries(),
 		arch:   "arch",
 	}
 	s.assertCommandOutput(c, expected, out, defaultIndexFileName, defaultImageFileName)

=== modified file 'environs/bootstrap/bootstrap_test.go'
--- environs/bootstrap/bootstrap_test.go	2014-03-28 13:27:45 +0000
+++ environs/bootstrap/bootstrap_test.go	2014-04-03 17:37:27 +0000
@@ -88,7 +88,7 @@
 
 func uploadTools(c *gc.C, env environs.Environ) {
 	usefulVersion := version.Current
-	usefulVersion.Series = env.Config().DefaultSeries()
+	usefulVersion.Series = config.PreferredSeries(env.Config())
 	envtesting.AssertUploadFakeToolsVersions(c, env.Storage(), usefulVersion)
 }
 
@@ -217,7 +217,7 @@
 	s.setDummyStorage(c, env)
 	envtesting.RemoveFakeTools(c, env.Storage())
 	arch := "ppc64"
-	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), &arch)
+	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), &arch)
 	c.Assert(err, gc.NotNil)
 	stripped := strings.Replace(err.Error(), "\n", "", -1)
 	c.Assert(stripped,
@@ -233,7 +233,7 @@
 	env := newEnviron("foo", useDefaultKeys, nil)
 	s.setDummyStorage(c, env)
 	envtesting.RemoveFakeTools(c, env.Storage())
-	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), nil)
+	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), nil)
 	c.Assert(err, gc.NotNil)
 	stripped := strings.Replace(err.Error(), "\n", "", -1)
 	c.Assert(stripped,
@@ -246,7 +246,7 @@
 	env := newEnviron("foo", useDefaultKeys, map[string]interface{}{"agent-version": "1.16.0"})
 	s.setDummyStorage(c, env)
 	envtesting.RemoveFakeTools(c, env.Storage())
-	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), nil)
+	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), nil)
 	c.Assert(err, gc.NotNil)
 	stripped := strings.Replace(err.Error(), "\n", "", -1)
 	c.Assert(stripped,
@@ -260,7 +260,7 @@
 	env := newEnviron("foo", useDefaultKeys, nil)
 	s.setDummyStorage(c, env)
 	envtesting.RemoveFakeTools(c, env.Storage())
-	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), nil)
+	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), nil)
 	c.Assert(err, gc.NotNil)
 	stripped := strings.Replace(err.Error(), "\n", "", -1)
 	c.Assert(stripped,
@@ -310,12 +310,12 @@
 		return "arm64"
 	})
 	arch := "arm64"
-	agentTools, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), &arch)
+	agentTools, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), &arch)
 	c.Assert(err, gc.IsNil)
 	c.Assert(agentTools, gc.HasLen, 1)
 	expectedVers := version.Current
 	expectedVers.Number.Build++
-	expectedVers.Series = env.Config().DefaultSeries()
+	expectedVers.Series = config.PreferredSeries(env.Config())
 	c.Assert(agentTools[0].Version, gc.DeepEquals, expectedVers)
 }
 
@@ -325,11 +325,18 @@
 	s.PatchValue(&version.Current, vers)
 	env := newEnviron("foo", useDefaultKeys, nil)
 	cfg := env.Config()
-	c.Assert(bootstrap.SeriesToUpload(cfg, nil), jc.SameContents, []string{"quantal", "precise"})
+
+	prefSeries := config.PreferredSeries(cfg)
+	expect := []string{"quantal", prefSeries}
+	if prefSeries != config.LatestLtsSeries() {
+		expect = append(expect, config.LatestLtsSeries())
+	}
+	c.Assert(bootstrap.SeriesToUpload(cfg, nil), jc.SameContents, expect)
+
 	c.Assert(bootstrap.SeriesToUpload(cfg, []string{"quantal"}), jc.SameContents, []string{"quantal"})
 	env = newEnviron("foo", useDefaultKeys, map[string]interface{}{"default-series": "lucid"})
 	cfg = env.Config()
-	c.Assert(bootstrap.SeriesToUpload(cfg, nil), jc.SameContents, []string{"quantal", "precise", "lucid"})
+	c.Assert(bootstrap.SeriesToUpload(cfg, nil), jc.SameContents, []string{"quantal", config.LatestLtsSeries(), "lucid"})
 }
 
 func (s *bootstrapSuite) assertUploadTools(c *gc.C, vers version.Binary, allowRelease bool,

=== modified file 'environs/bootstrap/synctools.go'
--- environs/bootstrap/synctools.go	2014-03-26 03:30:35 +0000
+++ environs/bootstrap/synctools.go	2014-04-03 17:37:27 +0000
@@ -100,8 +100,10 @@
 	unique := set.NewStrings(series...)
 	if unique.IsEmpty() {
 		unique.Add(version.Current.Series)
-		unique.Add(config.DefaultSeries)
-		unique.Add(cfg.DefaultSeries())
+		unique.Add(config.LatestLtsSeries())
+		if series, ok := cfg.DefaultSeries(); ok {
+			unique.Add(series)
+		}
 	}
 	return unique.Values()
 }
@@ -175,7 +177,10 @@
 	// No tools available so our only hope is to build locally and upload.
 	logger.Warningf("no prepackaged tools available")
 	uploadSeries := SeriesToUpload(cfg, nil)
-	if err := UploadTools(ctx, env, toolsArch, false, append(uploadSeries, series)...); err != nil {
+	if series != "" {
+		uploadSeries = append(uploadSeries, series)
+	}
+	if err := UploadTools(ctx, env, toolsArch, false, uploadSeries...); err != nil {
 		logger.Errorf("%s", noToolsMessage)
 		return nil, fmt.Errorf("cannot upload bootstrap tools: %v", err)
 	}

=== modified file 'environs/config/config.go'
--- environs/config/config.go	2014-04-02 06:15:57 +0000
+++ environs/config/config.go	2014-04-03 17:37:27 +0000
@@ -7,6 +7,7 @@
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -34,9 +35,6 @@
 	// port opened.
 	FwGlobal = "global"
 
-	// DefaultSeries returns the most recent Ubuntu LTS release name.
-	DefaultSeries string = "precise"
-
 	// DefaultStatePort is the default port the state server is listening on.
 	DefaultStatePort int = 37017
 
@@ -59,8 +57,53 @@
 	// refreshing the addresses, in seconds. Not too frequent, as we
 	// refresh addresses from the provider each time.
 	DefaultBootstrapSSHAddressesDelay int = 10
+
+	// fallbackLtsSeries is the latest LTS series we'll use, if we fail to
+	// obtain this information from the system.
+	fallbackLtsSeries string = "precise"
 )
 
+var latestLtsSeries string
+
+type HasDefaultSeries interface {
+	DefaultSeries() (string, bool)
+}
+
+// PreferredSeries returns the preferred series to use when a charm does not
+// explicitly specify a series.
+func PreferredSeries(cfg HasDefaultSeries) string {
+	if series, ok := cfg.DefaultSeries(); ok {
+		return series
+	}
+	return LatestLtsSeries()
+}
+
+func LatestLtsSeries() string {
+	if latestLtsSeries == "" {
+		series, err := distroLtsSeries()
+		if err != nil {
+			latestLtsSeries = fallbackLtsSeries
+		} else {
+			latestLtsSeries = series
+		}
+	}
+	return latestLtsSeries
+}
+
+// distroLtsSeries returns the latest LTS series, if this information is
+// available on this system.
+func distroLtsSeries() (string, error) {
+	out, err := exec.Command("distro-info", "--lts").Output()
+	if err != nil {
+		return "", err
+	}
+	series := strings.TrimSpace(string(out))
+	if !charm.IsValidSeries(series) {
+		return "", fmt.Errorf("not a valid LTS series: %q", series)
+	}
+	return series, nil
+}
+
 // Config holds an immutable environment configuration.
 type Config struct {
 	// defined holds the attributes that are defined for Config.
@@ -162,7 +205,6 @@
 	// For backward compatibility purposes, we treat as unset string
 	// valued attributes that are set to the empty string, and fill
 	// out their defaults accordingly.
-	c.fillInStringDefault("default-series")
 	c.fillInStringDefault("firewall-mode")
 
 	// Load authorized-keys-path into authorized-keys if necessary.
@@ -407,9 +449,17 @@
 	return c.mustString("name")
 }
 
-// DefaultSeries returns the default Ubuntu series for the environment.
-func (c *Config) DefaultSeries() string {
-	return c.mustString("default-series")
+// DefaultSeries returns the configured default Ubuntu series for the environment,
+// and whether the default series was explicitly configured on the environment.
+func (c *Config) DefaultSeries() (string, bool) {
+	if s, ok := c.defined["default-series"]; ok {
+		if series, ok := s.(string); ok && series != "" {
+			return series, true
+		} else if !ok {
+			logger.Warningf("invalid default-series: %q", s)
+		}
+	}
+	return "", false
 }
 
 // StatePort returns the state server port for the environment.
@@ -771,6 +821,8 @@
 	"image-metadata-url": "", // TODO(rog) omit
 	"tools-metadata-url": "", // TODO(rog) omit
 
+	"default-series": "",
+
 	// For backward compatibility only - default ports were
 	// not filled out in previous versions of the configuration.
 	"state-port":  DefaultStatePort,
@@ -795,7 +847,6 @@
 // UseDefaults.
 func allDefaults() schema.Defaults {
 	d := schema.Defaults{
-		"default-series":            DefaultSeries,
 		"firewall-mode":             FwInstance,
 		"development":               false,
 		"ssl-hostname-verification": true,

=== modified file 'environs/config/config_test.go'
--- environs/config/config_test.go	2014-03-26 08:14:32 +0000
+++ environs/config/config_test.go	2014-04-03 17:37:27 +0000
@@ -652,7 +652,6 @@
 	authTokenConfigTest("token=value, =z", false),
 	authTokenConfigTest("token=value =z", false),
 	authTokenConfigTest("\t", false),
-	missingAttributeNoDefault("default-series"),
 	missingAttributeNoDefault("firewall-mode"),
 	missingAttributeNoDefault("development"),
 	missingAttributeNoDefault("ssl-hostname-verification"),
@@ -861,11 +860,14 @@
 	testmode, _ := test.attrs["test-mode"].(bool)
 	c.Assert(cfg.TestMode(), gc.Equals, testmode)
 
-	if series, _ := test.attrs["default-series"].(string); series != "" {
-		c.Assert(cfg.DefaultSeries(), gc.Equals, series)
+	series, _ := test.attrs["default-series"].(string)
+	if defaultSeries, ok := cfg.DefaultSeries(); ok {
+		c.Assert(defaultSeries, gc.Equals, series)
 	} else {
-		c.Assert(cfg.DefaultSeries(), gc.Equals, config.DefaultSeries)
+		c.Assert(series, gc.Equals, "")
+		c.Assert(defaultSeries, gc.Equals, "")
 	}
+
 	if m, _ := test.attrs["firewall-mode"].(string); m != "" {
 		c.Assert(cfg.FirewallMode(), gc.Equals, m)
 	}
@@ -1010,7 +1012,7 @@
 		"bootstrap-timeout":         3600,
 		"bootstrap-retry-delay":     30,
 		"bootstrap-addresses-delay": 10,
-		"default-series":            "precise",
+		"default-series":            testing.FakeDefaultSeries,
 		"charm-store-auth":          "token=auth",
 		"test-mode":                 false,
 	}
@@ -1019,7 +1021,6 @@
 
 	// These attributes are added if not set.
 	attrs["development"] = false
-	attrs["default-series"] = config.DefaultSeries
 	attrs["logging-config"] = "<root>=WARNING;unit=DEBUG"
 	attrs["ca-private-key"] = ""
 	attrs["image-metadata-url"] = ""

=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go	2014-04-03 02:57:11 +0000
+++ environs/jujutest/livetests.go	2014-04-03 17:37:27 +0000
@@ -133,7 +133,7 @@
 	// we could connect to (actual live tests, rather than local-only)
 	cons := constraints.MustParse("mem=2G")
 	if t.CanOpenState {
-		_, err := sync.Upload(t.Env.Storage(), nil, config.DefaultSeries)
+		_, err := sync.Upload(t.Env.Storage(), nil, coretesting.FakeDefaultSeries)
 		c.Assert(err, gc.IsNil)
 	}
 	envtesting.UploadFakeTools(c, t.Env.Storage())
@@ -442,7 +442,7 @@
 
 	// If the series has not been specified, we expect the most recent Ubuntu LTS release to be used.
 	expectedVersion := version.Current
-	expectedVersion.Series = config.DefaultSeries
+	expectedVersion.Series = config.LatestLtsSeries()
 
 	mtools0 := waitAgentTools(c, mw0, expectedVersion)
 

=== modified file 'environs/testing/tools.go'
--- environs/testing/tools.go	2014-03-27 00:42:27 +0000
+++ environs/testing/tools.go	2014-04-03 17:37:27 +0000
@@ -13,7 +13,6 @@
 
 	agenttools "launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
@@ -163,8 +162,9 @@
 func uploadFakeTools(stor storage.Storage) error {
 	versions := []version.Binary{version.Current}
 	toolsVersion := version.Current
-	if toolsVersion.Series != config.DefaultSeries {
-		toolsVersion.Series = config.DefaultSeries
+	latestLts := coretesting.FakeDefaultSeries
+	if toolsVersion.Series != latestLts {
+		toolsVersion.Series = latestLts
 		versions = append(versions, toolsVersion)
 	}
 	if _, err := UploadFakeToolsVersions(stor, versions...); err != nil {
@@ -175,9 +175,9 @@
 
 // UploadFakeTools puts fake tools into the supplied storage with a binary
 // version matching version.Current; if version.Current's series is different
-// to config.DefaultSeries, matching fake tools will be uploaded for that series.
-// This is useful for tests that are kinda casual about specifying their
-// environment.
+// to coretesting.FakeDefaultSeries, matching fake tools will be uploaded for that
+// series.  This is useful for tests that are kinda casual about specifying
+// their environment.
 func UploadFakeTools(c *gc.C, stor storage.Storage) {
 	c.Assert(uploadFakeTools(stor), gc.IsNil)
 }
@@ -196,8 +196,9 @@
 	name := envtools.StorageName(toolsVersion)
 	err := stor.Remove(name)
 	c.Check(err, gc.IsNil)
-	if version.Current.Series != config.DefaultSeries {
-		toolsVersion.Series = config.DefaultSeries
+	defaultSeries := coretesting.FakeDefaultSeries
+	if version.Current.Series != defaultSeries {
+		toolsVersion.Series = defaultSeries
 		name := envtools.StorageName(toolsVersion)
 		err := stor.Remove(name)
 		c.Check(err, gc.IsNil)

=== modified file 'juju/apiconn_test.go'
--- juju/apiconn_test.go	2014-04-02 00:18:34 +0000
+++ juju/apiconn_test.go	2014-04-03 17:37:27 +0000
@@ -175,7 +175,7 @@
 			"name":                      "myenv",
 			"state-server":              true,
 			"authorized-keys":           "i-am-a-key",
-			"default-series":            config.DefaultSeries,
+			"default-series":            config.LatestLtsSeries(),
 			"firewall-mode":             config.FwInstance,
 			"development":               false,
 			"ssl-hostname-verification": true,

=== modified file 'juju/testing/conn.go'
--- juju/testing/conn.go	2014-03-25 15:06:31 +0000
+++ juju/testing/conn.go	2014-04-03 17:37:27 +0000
@@ -17,6 +17,7 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
+	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
 	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/juju"
@@ -164,6 +165,14 @@
 	return s.openAPIAs(c, machine.Tag(), password, "fake_nonce"), machine
 }
 
+func PreferredDefaultVersions(conf *config.Config, template version.Binary) []version.Binary {
+	prefVersion := template
+	prefVersion.Series = config.PreferredSeries(conf)
+	defaultVersion := template
+	defaultVersion.Series = testing.FakeDefaultSeries
+	return []version.Binary{prefVersion, defaultVersion}
+}
+
 func (s *JujuConnSuite) setUpConn(c *gc.C) {
 	if s.RootDir != "" {
 		panic("JujuConnSuite.setUpConn without teardown")
@@ -203,7 +212,11 @@
 	c.Assert(environ.Name(), gc.Equals, "dummyenv")
 	s.PatchValue(&dummy.DataDir, s.DataDir())
 
-	envtesting.MustUploadFakeTools(environ.Storage())
+	versions := PreferredDefaultVersions(environ.Config(), version.Current)
+	versions = append(versions, version.Current)
+
+	// Upload tools for both preferred and fake default series
+	envtesting.MustUploadFakeToolsVersions(environ.Storage(), versions...)
 	c.Assert(bootstrap.Bootstrap(ctx, environ, constraints.Value{}), gc.IsNil)
 
 	s.BackingState = environ.(GetStater).GetStateInAPIServer()
@@ -285,7 +298,7 @@
 	ch := testing.Charms.Dir(name)
 	ident := fmt.Sprintf("%s-%d", ch.Meta().Name, ch.Revision())
 	curl := charm.MustParseURL("local:quantal/" + ident)
-	repo, err := charm.InferRepository(curl, testing.Charms.Path())
+	repo, err := charm.InferRepository(curl.Reference, testing.Charms.Path())
 	c.Assert(err, gc.IsNil)
 	sch, err := s.Conn.PutCharm(curl, repo, false)
 	c.Assert(err, gc.IsNil)

=== modified file 'juju/testing/instance.go'
--- juju/testing/instance.go	2014-04-01 16:27:22 +0000
+++ juju/testing/instance.go	2014-04-03 17:37:27 +0000
@@ -10,6 +10,7 @@
 
 	"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/instance"
 	"launchpad.net/juju-core/names"
@@ -112,7 +113,7 @@
 ) (
 	instance.Instance, *instance.HardwareCharacteristics, error,
 ) {
-	series := env.Config().DefaultSeries()
+	series := config.PreferredSeries(env.Config())
 	agentVersion, ok := env.Config().AgentVersion()
 	if !ok {
 		return nil, nil, fmt.Errorf("missing agent version in environment config")

=== modified file 'provider/azure/environ_test.go'
--- provider/azure/environ_test.go	2014-04-03 09:07:57 +0000
+++ provider/azure/environ_test.go	2014-04-03 17:37:27 +0000
@@ -448,7 +448,7 @@
 	err = env.SetConfig(cfg)
 	c.Assert(err, gc.IsNil)
 
-	c.Check(env.ecfg.Config.DefaultSeries(), gc.Equals, "feisty")
+	c.Check(config.PreferredSeries(env.ecfg.Config), gc.Equals, "feisty")
 }
 
 func (*environSuite) TestSetConfigLocksEnviron(c *gc.C) {

=== modified file 'provider/common/bootstrap.go'
--- provider/common/bootstrap.go	2014-03-28 22:31:08 +0000
+++ provider/common/bootstrap.go	2014-04-03 17:37:27 +0000
@@ -42,7 +42,7 @@
 	defer func() { handleBootstrapError(err, ctx, inst, env) }()
 
 	// First thing, ensure we have tools otherwise there's no point.
-	selectedTools, err := EnsureBootstrapTools(ctx, env, env.Config().DefaultSeries(), cons.Arch)
+	selectedTools, err := EnsureBootstrapTools(ctx, env, config.PreferredSeries(env.Config()), cons.Arch)
 	if err != nil {
 		return err
 	}

=== modified file 'provider/dummy/environs.go'
--- provider/dummy/environs.go	2014-04-03 03:37:45 +0000
+++ provider/dummy/environs.go	2014-04-03 17:37:27 +0000
@@ -545,7 +545,7 @@
 }
 
 func (e *environ) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
-	selectedTools, err := common.EnsureBootstrapTools(ctx, e, e.Config().DefaultSeries(), cons.Arch)
+	selectedTools, err := common.EnsureBootstrapTools(ctx, e, config.PreferredSeries(e.Config()), cons.Arch)
 	if err != nil {
 		return err
 	}

=== modified file 'provider/ec2/ec2.go'
--- provider/ec2/ec2.go	2014-04-03 03:37:45 +0000
+++ provider/ec2/ec2.go	2014-04-03 17:37:27 +0000
@@ -367,7 +367,7 @@
 		return nil, err
 	}
 	return &simplestreams.MetadataLookupParams{
-		Series:        e.ecfg().DefaultSeries(),
+		Series:        config.PreferredSeries(e.ecfg()),
 		Region:        cloudSpec.Region,
 		Endpoint:      cloudSpec.Endpoint,
 		Architectures: arch.AllSupportedArches,

=== modified file 'provider/ec2/live_test.go'
--- provider/ec2/live_test.go	2014-03-20 03:06:57 +0000
+++ provider/ec2/live_test.go	2014-04-03 17:37:27 +0000
@@ -101,7 +101,7 @@
 	t.LiveTests.SetUpTest(c)
 	t.PatchValue(&version.Current, version.Binary{
 		Number: version.Current.Number,
-		Series: config.DefaultSeries,
+		Series: coretesting.FakeDefaultSeries,
 		Arch:   arch.AMD64,
 	})
 

=== modified file 'provider/ec2/local_test.go'
--- provider/ec2/local_test.go	2014-04-02 11:35:49 +0000
+++ provider/ec2/local_test.go	2014-04-03 17:37:27 +0000
@@ -205,7 +205,7 @@
 	t.Tests.SetUpTest(c)
 	t.PatchValue(&version.Current, version.Binary{
 		Number: version.Current.Number,
-		Series: config.DefaultSeries,
+		Series: coretesting.FakeDefaultSeries,
 		Arch:   arch.AMD64,
 	})
 }

=== modified file 'provider/joyent/environ.go'
--- provider/joyent/environ.go	2014-04-03 03:37:45 +0000
+++ provider/joyent/environ.go	2014-04-03 17:37:27 +0000
@@ -154,7 +154,7 @@
 		region = env.Ecfg().Region()
 	}
 	return &simplestreams.MetadataLookupParams{
-		Series:        env.Ecfg().DefaultSeries(),
+		Series:        config.PreferredSeries(env.Ecfg()),
 		Region:        region,
 		Endpoint:      env.Ecfg().sdcUrl(),
 		Architectures: []string{"amd64", "arm"},

=== modified file 'provider/openstack/provider.go'
--- provider/openstack/provider.go	2014-04-03 03:37:45 +0000
+++ provider/openstack/provider.go	2014-04-03 17:37:27 +0000
@@ -1236,7 +1236,7 @@
 		return nil, err
 	}
 	return &simplestreams.MetadataLookupParams{
-		Series:        e.ecfg().DefaultSeries(),
+		Series:        config.PreferredSeries(e.ecfg()),
 		Region:        cloudSpec.Region,
 		Endpoint:      cloudSpec.Endpoint,
 		Architectures: arch.AllSupportedArches,

=== modified file 'state/api/client.go'
--- state/api/client.go	2014-03-28 13:31:26 +0000
+++ state/api/client.go	2014-04-03 17:37:27 +0000
@@ -608,6 +608,24 @@
 	return c.call("AddCharm", args, nil)
 }
 
+// ResolveCharms resolves the best available charm URLs with series, for charm
+// locations without a series specified.
+func (c *Client) ResolveCharm(ref charm.Reference) (*charm.URL, error) {
+	args := params.ResolveCharms{References: []charm.Reference{ref}}
+	result := new(params.ResolveCharmResults)
+	if err := c.st.Call("Client", "", "ResolveCharms", args, result); err != nil {
+		return nil, err
+	}
+	if len(result.URLs) == 0 {
+		return nil, fmt.Errorf("unexpected empty response")
+	}
+	urlInfo := result.URLs[0]
+	if urlInfo.Error != "" {
+		return nil, fmt.Errorf("%v", urlInfo.Error)
+	}
+	return urlInfo.URL, nil
+}
+
 func (c *Client) UploadTools(
 	toolsFilename string, vers version.Binary, fakeSeries ...string,
 ) (

=== modified file 'state/api/params/params.go'
--- state/api/params/params.go	2014-04-03 02:57:11 +0000
+++ state/api/params/params.go	2014-04-03 17:37:27 +0000
@@ -330,6 +330,22 @@
 	CharmURL string
 }
 
+// ResolveCharms stores charm references for a ResolveCharms call.
+type ResolveCharms struct {
+	References []charm.Reference
+}
+
+// ResolveCharmResult holds the result of resolving a charm reference to a URL, or any error that occurred.
+type ResolveCharmResult struct {
+	URL   *charm.URL `json:",omitempty"`
+	Error string     `json:",omitempty"`
+}
+
+// ResolveCharmResults holds results of the ResolveCharms call.
+type ResolveCharmResults struct {
+	URLs []ResolveCharmResult
+}
+
 // AllWatcherId holds the id of an AllWatcher.
 type AllWatcherId struct {
 	AllWatcherId string

=== modified file 'state/apiserver/client/client.go'
--- state/apiserver/client/client.go	2014-03-28 13:31:26 +0000
+++ state/apiserver/client/client.go	2014-04-03 17:37:27 +0000
@@ -567,16 +567,8 @@
 	results := params.AddMachinesResults{
 		Machines: make([]params.AddMachinesResult, len(args.MachineParams)),
 	}
-
-	var defaultSeries string
-	conf, err := c.api.state.EnvironConfig()
-	if err != nil {
-		return results, err
-	}
-	defaultSeries = conf.DefaultSeries()
-
 	for i, p := range args.MachineParams {
-		m, err := c.addOneMachine(p, defaultSeries)
+		m, err := c.addOneMachine(p)
 		results.Machines[i].Error = common.ServerError(err)
 		if err == nil {
 			results.Machines[i].Machine = m.Id()
@@ -590,9 +582,13 @@
 	return c.AddMachines(args)
 }
 
-func (c *Client) addOneMachine(p params.AddMachineParams, defaultSeries string) (*state.Machine, error) {
+func (c *Client) addOneMachine(p params.AddMachineParams) (*state.Machine, error) {
 	if p.Series == "" {
-		p.Series = defaultSeries
+		conf, err := c.api.state.EnvironConfig()
+		if err != nil {
+			return nil, err
+		}
+		p.Series = config.PreferredSeries(conf)
 	}
 	if p.ContainerType != "" {
 		// Guard against dubious client by making sure that
@@ -709,7 +705,7 @@
 	}
 
 	info := api.EnvironmentInfo{
-		DefaultSeries: conf.DefaultSeries(),
+		DefaultSeries: config.PreferredSeries(conf),
 		ProviderType:  conf.Type(),
 		Name:          conf.Name(),
 		UUID:          env.UUID(),
@@ -955,6 +951,37 @@
 	return err
 }
 
+func (c *Client) ResolveCharms(args params.ResolveCharms) (params.ResolveCharmResults, error) {
+	var results params.ResolveCharmResults
+
+	envConfig, err := c.api.state.EnvironConfig()
+	if err != nil {
+		return params.ResolveCharmResults{}, err
+	}
+	repo := config.SpecializeCharmRepo(CharmStore, envConfig)
+
+	for _, ref := range args.References {
+		result := params.ResolveCharmResult{}
+		curl, err := c.resolveCharm(ref, repo)
+		if err != nil {
+			result.Error = err.Error()
+		} else {
+			result.URL = curl
+		}
+		results.URLs = append(results.URLs, result)
+	}
+	return results, nil
+}
+
+func (c *Client) resolveCharm(ref charm.Reference, repo charm.Repository) (*charm.URL, error) {
+	if ref.Schema != "cs" {
+		return nil, fmt.Errorf("only charm store charm references are supported, with cs: schema")
+	}
+
+	// Resolve the charm location with the repository.
+	return repo.Resolve(ref)
+}
+
 // CharmArchiveName returns a string that is suitable as a file name
 // in a storage URL. It is constructed from the charm name, revision
 // and a random UUID string.
@@ -993,7 +1020,7 @@
 		if err != nil {
 			return err
 		}
-		series = cfg.DefaultSeries()
+		series = config.PreferredSeries(cfg)
 	}
 	return c.api.state.EnsureAvailability(args.NumStateServers, args.Constraints, series)
 }

=== modified file 'state/apiserver/client/client_test.go'
--- state/apiserver/client/client_test.go	2014-04-01 03:37:13 +0000
+++ state/apiserver/client/client_test.go	2014-04-03 17:37:27 +0000
@@ -261,7 +261,7 @@
 	c.Assert(err, gc.IsNil)
 	env, err := s.State.Environment()
 	c.Assert(err, gc.IsNil)
-	c.Assert(info.DefaultSeries, gc.Equals, conf.DefaultSeries())
+	c.Assert(info.DefaultSeries, gc.Equals, config.PreferredSeries(conf))
 	c.Assert(info.ProviderType, gc.Equals, conf.Type())
 	c.Assert(info.Name, gc.Equals, conf.Name())
 	c.Assert(info.UUID, gc.Equals, env.UUID())
@@ -1119,8 +1119,12 @@
 }
 
 func addCharm(c *gc.C, store *coretesting.MockCharmStore, name string) (*charm.URL, charm.Charm) {
+	return addSeriesCharm(c, store, "precise", name)
+}
+
+func addSeriesCharm(c *gc.C, store *coretesting.MockCharmStore, series, name string) (*charm.URL, charm.Charm) {
 	bundle := coretesting.Charms.Bundle(c.MkDir(), name)
-	scurl := fmt.Sprintf("cs:precise/%s-%d", name, bundle.Revision())
+	scurl := fmt.Sprintf("cs:%s/%s-%d", series, name, bundle.Revision())
 	curl := charm.MustParseURL(scurl)
 	err := store.SetCharm(curl, bundle)
 	c.Assert(err, gc.IsNil)
@@ -1634,7 +1638,7 @@
 	c.Assert(len(machines), gc.Equals, 3)
 	for i, machineResult := range machines {
 		c.Assert(machineResult.Machine, gc.DeepEquals, strconv.Itoa(i))
-		s.checkMachine(c, machineResult.Machine, config.DefaultSeries, apiParams[i].Constraints.String())
+		s.checkMachine(c, machineResult.Machine, coretesting.FakeDefaultSeries, apiParams[i].Constraints.String())
 	}
 }
 
@@ -1684,7 +1688,7 @@
 	c.Assert(len(machines), gc.Equals, 3)
 	for i, machineResult := range machines {
 		c.Assert(machineResult.Machine, gc.DeepEquals, strconv.Itoa(i))
-		s.checkMachine(c, machineResult.Machine, config.DefaultSeries, apiParams[i].Constraints.String())
+		s.checkMachine(c, machineResult.Machine, coretesting.FakeDefaultSeries, apiParams[i].Constraints.String())
 	}
 }
 
@@ -1755,7 +1759,7 @@
 			c.Assert(machineResult.Error, gc.ErrorMatches, "cannot add a new machine: cannot add a machine with an instance id and no nonce")
 		} else {
 			c.Assert(machineResult.Machine, gc.DeepEquals, strconv.Itoa(i))
-			s.checkMachine(c, machineResult.Machine, config.DefaultSeries, apiParams[i].Constraints.String())
+			s.checkMachine(c, machineResult.Machine, coretesting.FakeDefaultSeries, apiParams[i].Constraints.String())
 			instanceId := fmt.Sprintf("1234-%d", i)
 			s.checkInstance(c, machineResult.Machine, instanceId, "foo", hc, addrs)
 		}
@@ -1943,6 +1947,57 @@
 	s.assertUploaded(c, storage, sch.BundleURL(), sch.BundleSha256())
 }
 
+var resolveCharmCases = []struct {
+	schema, defaultSeries, charmName string
+	parseErr                         string
+	resolveErr                       string
+}{
+	{"cs", "precise", "wordpress", "", ""},
+	{"cs", "trusty", "wordpress", "", ""},
+	{"cs", "", "wordpress", "", `missing default series, cannot resolve charm url: "cs:wordpress"`},
+	{"cs", "trusty", "", `charm URL has invalid charm name: "cs:"`, ""},
+	{"local", "trusty", "wordpress", "", `only charm store charm references are supported, with cs: schema`},
+	{"cs", "precise", "hl3", "", ""},
+	{"cs", "trusty", "hl3", "", ""},
+	{"cs", "", "hl3", "", `missing default series, cannot resolve charm url: \"cs:hl3\"`},
+}
+
+func (s *clientSuite) TestResolveCharm(c *gc.C) {
+	store, restore := makeMockCharmStore()
+	defer restore()
+
+	for i, test := range resolveCharmCases {
+		c.Logf("test %d: %#v", i, test)
+		// Mock charm store will use this to resolve a charm reference.
+		store.DefaultSeries = test.defaultSeries
+
+		client := s.APIState.Client()
+		ref, series, err := charm.ParseReference(fmt.Sprintf("%s:%s", test.schema, test.charmName))
+		if test.parseErr == "" {
+			if !c.Check(err, gc.IsNil) {
+				continue
+			}
+		} else {
+			c.Assert(err, gc.NotNil)
+			c.Check(err, gc.ErrorMatches, test.parseErr)
+			continue
+		}
+		c.Check(series, gc.Equals, "")
+		c.Check(ref.String(), gc.Equals, fmt.Sprintf("%s:%s", test.schema, test.charmName))
+
+		curl, err := client.ResolveCharm(ref)
+		if err == nil {
+			c.Assert(curl, gc.NotNil)
+			// Only cs: schema should make it through here
+			c.Check(curl.String(), gc.Equals, fmt.Sprintf("cs:%s/%s", test.defaultSeries, test.charmName))
+			c.Check(test.resolveErr, gc.Equals, "")
+		} else {
+			c.Check(curl, gc.IsNil)
+			c.Check(err, gc.ErrorMatches, test.resolveErr)
+		}
+	}
+}
+
 func (s *clientSuite) TestAddCharmConcurrently(c *gc.C) {
 	store, restore := makeMockCharmStore()
 	defer restore()

=== modified file 'testing/environ.go'
--- testing/environ.go	2014-04-01 08:20:44 +0000
+++ testing/environ.go	2014-04-03 17:37:27 +0000
@@ -28,6 +28,8 @@
 	}
 }
 
+const FakeDefaultSeries = "precise"
+
 // FakeConfig() returns an environment configuration for a
 // fake provider with all required attributes set.
 func FakeConfig() Attrs {
@@ -43,7 +45,7 @@
 		"development":               false,
 		"state-port":                19034,
 		"api-port":                  17777,
-		"default-series":            config.DefaultSeries,
+		"default-series":            FakeDefaultSeries,
 	}
 }
 

=== modified file 'worker/provisioner/container_initialisation_test.go'
--- worker/provisioner/container_initialisation_test.go	2014-03-19 03:48:12 +0000
+++ worker/provisioner/container_initialisation_test.go	2014-04-03 17:37:27 +0000
@@ -12,10 +12,10 @@
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	apiprovisioner "launchpad.net/juju-core/state/api/provisioner"
+	coretesting "launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker"
@@ -88,7 +88,7 @@
 
 	// make a container on the host machine
 	template := state.MachineTemplate{
-		Series: config.DefaultSeries,
+		Series: coretesting.FakeDefaultSeries,
 		Jobs:   []state.MachineJob{state.JobHostUnits},
 	}
 	container, err := s.State.AddMachineInsideMachine(template, host.Id(), ctype)
@@ -131,7 +131,7 @@
 	for _, ctype := range instance.ContainerTypes {
 		// create a machine to host the container.
 		m, err := s.BackingState.AddOneMachine(state.MachineTemplate{
-			Series:      config.DefaultSeries,
+			Series:      coretesting.FakeDefaultSeries,
 			Jobs:        []state.MachineJob{state.JobHostUnits},
 			Constraints: s.defaultConstraints,
 		})
@@ -154,7 +154,7 @@
 
 	// create a machine to host the container.
 	m, err := s.BackingState.AddOneMachine(state.MachineTemplate{
-		Series:      config.DefaultSeries,
+		Series:      coretesting.FakeDefaultSeries,
 		Jobs:        []state.MachineJob{state.JobHostUnits},
 		Constraints: s.defaultConstraints,
 	})

=== modified file 'worker/provisioner/kvm-broker_test.go'
--- worker/provisioner/kvm-broker_test.go	2014-04-02 11:35:49 +0000
+++ worker/provisioner/kvm-broker_test.go	2014-04-03 17:37:27 +0000
@@ -16,7 +16,6 @@
 	"launchpad.net/juju-core/container/kvm/mock"
 	kvmtesting "launchpad.net/juju-core/container/kvm/testing"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	instancetest "launchpad.net/juju-core/instance/testing"
@@ -162,7 +161,7 @@
 
 	// The kvm provisioner actually needs the machine it is being created on
 	// to be in state, in order to get the watcher.
-	m, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits, state.JobManageEnviron)
+	m, err := s.State.AddMachine(coretesting.FakeDefaultSeries, state.JobHostUnits, state.JobManageEnviron)
 	c.Assert(err, gc.IsNil)
 	err = m.SetAddresses(instance.NewAddress("0.1.2.3", instance.NetworkUnknown))
 	c.Assert(err, gc.IsNil)
@@ -227,7 +226,7 @@
 	defer stop(c, p)
 
 	// Check that an instance is not provisioned when the machine is created.
-	_, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits)
+	_, err := s.State.AddMachine(coretesting.FakeDefaultSeries, state.JobHostUnits)
 	c.Assert(err, gc.IsNil)
 
 	s.expectNoEvents(c)
@@ -244,7 +243,7 @@
 
 func (s *kvmProvisionerSuite) addContainer(c *gc.C) *state.Machine {
 	template := state.MachineTemplate{
-		Series: config.DefaultSeries,
+		Series: coretesting.FakeDefaultSeries,
 		Jobs:   []state.MachineJob{state.JobHostUnits},
 	}
 	container, err := s.State.AddMachineInsideMachine(template, s.machineId, instance.KVM)

=== modified file 'worker/provisioner/lxc-broker_test.go'
--- worker/provisioner/lxc-broker_test.go	2014-04-02 11:35:49 +0000
+++ worker/provisioner/lxc-broker_test.go	2014-04-03 17:37:27 +0000
@@ -17,7 +17,6 @@
 	"launchpad.net/juju-core/container/lxc/mock"
 	lxctesting "launchpad.net/juju-core/container/lxc/testing"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	instancetest "launchpad.net/juju-core/instance/testing"
@@ -191,7 +190,7 @@
 
 	// The lxc provisioner actually needs the machine it is being created on
 	// to be in state, in order to get the watcher.
-	m, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits, state.JobManageEnviron)
+	m, err := s.State.AddMachine(coretesting.FakeDefaultSeries, state.JobHostUnits, state.JobManageEnviron)
 	c.Assert(err, gc.IsNil)
 	err = m.SetAddresses(instance.NewAddress("0.1.2.3", instance.NetworkUnknown))
 	c.Assert(err, gc.IsNil)
@@ -260,7 +259,7 @@
 	defer stop(c, p)
 
 	// Check that an instance is not provisioned when the machine is created.
-	_, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits)
+	_, err := s.State.AddMachine(coretesting.FakeDefaultSeries, state.JobHostUnits)
 	c.Assert(err, gc.IsNil)
 
 	s.expectNoEvents(c)
@@ -277,7 +276,7 @@
 
 func (s *lxcProvisionerSuite) addContainer(c *gc.C) *state.Machine {
 	template := state.MachineTemplate{
-		Series: config.DefaultSeries,
+		Series: coretesting.FakeDefaultSeries,
 		Jobs:   []state.MachineJob{state.JobHostUnits},
 	}
 	container, err := s.State.AddMachineInsideMachine(template, s.parentMachineId, instance.LXC)

=== modified file 'worker/provisioner/provisioner_test.go'
--- worker/provisioner/provisioner_test.go	2014-04-02 07:50:15 +0000
+++ worker/provisioner/provisioner_test.go	2014-04-03 17:37:27 +0000
@@ -349,7 +349,7 @@
 
 func (s *CommonProvisionerSuite) addMachineWithNetworks(includeNetworks, excludeNetworks []string) (*state.Machine, error) {
 	return s.BackingState.AddOneMachine(state.MachineTemplate{
-		Series:          config.DefaultSeries,
+		Series:          coretesting.FakeDefaultSeries,
 		Jobs:            []state.MachineJob{state.JobHostUnits},
 		Constraints:     s.defaultConstraints,
 		IncludeNetworks: includeNetworks,
@@ -442,7 +442,7 @@
 
 	// make a container on the machine we just created
 	template := state.MachineTemplate{
-		Series: config.DefaultSeries,
+		Series: coretesting.FakeDefaultSeries,
 		Jobs:   []state.MachineJob{state.JobHostUnits},
 	}
 	container, err := s.State.AddMachineInsideMachine(template, m.Id(), instance.LXC)