1
=== modified file 'charm/charm.go'
2
--- charm/charm.go	2014-03-17 18:46:17 +0000
3
+++ charm/charm.go	2014-04-03 17:37:27 +0000
4
@@ -30,10 +30,10 @@
5
30
	return ReadBundle(path)
30
	return ReadBundle(path)
6
31
}
31
}
7
32
32
12
33
// InferRepository returns a charm repository inferred from
33
// InferRepository returns a charm repository inferred from the provided charm
13
34
// the provided URL. Local URLs will use the provided path.
34
// reference. Local references will use the provided path.
14
35
func InferRepository(curl *URL, localRepoPath string) (repo Repository, err error) {
35
func InferRepository(ref Reference, localRepoPath string) (repo Repository, err error) {
15
36
	switch curl.Schema {
36
	switch ref.Schema {
16
37
	case "cs":
37
	case "cs":
17
38
		repo = Store
38
		repo = Store
18
39
	case "local":
39
	case "local":
19
@@ -42,7 +42,7 @@
20
42
		}
42
		}
21
43
		repo = &LocalRepository{Path: localRepoPath}
43
		repo = &LocalRepository{Path: localRepoPath}
22
44
	default:
44
	default:
24
45
		return nil, fmt.Errorf("unknown schema for charm URL %q", curl)
45
		return nil, fmt.Errorf("unknown schema for charm reference %q", ref)
25
46
	}
46
	}
26
47
	return
47
	return
27
48
}
48
}
28
49
49
29
=== modified file 'charm/charm_test.go'
30
--- charm/charm_test.go	2014-03-18 05:08:25 +0000
31
+++ charm/charm_test.go	2014-04-03 17:37:27 +0000
32
@@ -48,7 +48,7 @@
33
48
		c.Logf("test %d", i)
48
		c.Logf("test %d", i)
34
49
		curl, err := charm.InferURL(t.url, "precise")
49
		curl, err := charm.InferURL(t.url, "precise")
35
50
		c.Assert(err, gc.IsNil)
50
		c.Assert(err, gc.IsNil)
37
51
		repo, err := charm.InferRepository(curl, "/some/path")
51
		repo, err := charm.InferRepository(curl.Reference, "/some/path")
38
52
		c.Assert(err, gc.IsNil)
52
		c.Assert(err, gc.IsNil)
39
53
		switch repo := repo.(type) {
53
		switch repo := repo.(type) {
40
54
		case *charm.LocalRepository:
54
		case *charm.LocalRepository:
41
@@ -59,11 +59,11 @@
42
59
	}
59
	}
43
60
	curl, err := charm.InferURL("local:whatever", "precise")
60
	curl, err := charm.InferURL("local:whatever", "precise")
44
61
	c.Assert(err, gc.IsNil)
61
	c.Assert(err, gc.IsNil)
46
62
	_, err = charm.InferRepository(curl, "")
62
	_, err = charm.InferRepository(curl.Reference, "")
47
63
	c.Assert(err, gc.ErrorMatches, "path to local repository not specified")
63
	c.Assert(err, gc.ErrorMatches, "path to local repository not specified")
48
64
	curl.Schema = "foo"
64
	curl.Schema = "foo"
51
65
	_, err = charm.InferRepository(curl, "")
65
	_, err = charm.InferRepository(curl.Reference, "")
52
66
	c.Assert(err, gc.ErrorMatches, "unknown schema for charm URL.*")
66
	c.Assert(err, gc.ErrorMatches, "unknown schema for charm reference.*")
53
67
}
67
}
54
68
68
55
69
func checkDummy(c *gc.C, f charm.Charm, path string) {
69
func checkDummy(c *gc.C, f charm.Charm, path string) {
56
70
70
57
=== modified file 'charm/url.go'
58
--- charm/url.go	2014-03-24 15:35:41 +0000
59
+++ charm/url.go	2014-04-03 17:37:27 +0000
60
@@ -284,8 +284,6 @@
61
284
	return nil
284
	return nil
62
285
}
285
}
63
286
286
64
287
var jsonNull = []byte("null")
65
288
66
289
func (u *URL) MarshalJSON() ([]byte, error) {
287
func (u *URL) MarshalJSON() ([]byte, error) {
67
290
	if u == nil {
288
	if u == nil {
68
291
		panic("cannot marshal nil *charm.URL")
289
		panic("cannot marshal nil *charm.URL")
69
@@ -306,6 +304,23 @@
70
306
	return nil
304
	return nil
71
307
}
305
}
72
308
306
73
307
func (r *Reference) MarshalJSON() ([]byte, error) {
74
308
	return json.Marshal(r.String())
75
309
}
76
310
77
311
func (r *Reference) UnmarshalJSON(b []byte) error {
78
312
	var s string
79
313
	if err := json.Unmarshal(b, &s); err != nil {
80
314
		return err
81
315
	}
82
316
	ref, _, err := ParseReference(s)
83
317
	if err != nil {
84
318
		return err
85
319
	}
86
320
	*r = ref
87
321
	return nil
88
322
}
89
323
90
309
// Quote translates a charm url string into one which can be safely used
324
// Quote translates a charm url string into one which can be safely used
91
310
// in a file path.  ASCII letters, ASCII digits, dot and dash stay the
325
// in a file path.  ASCII letters, ASCII digits, dot and dash stay the
92
311
// same; other characters are translated to their hex representation
326
// same; other characters are translated to their hex representation
93
312
327
94
=== modified file 'charm/url_test.go'
95
--- charm/url_test.go	2014-03-24 15:35:41 +0000
96
+++ charm/url_test.go	2014-04-03 17:37:27 +0000
97
@@ -258,7 +258,7 @@
98
258
	Unmarshal: json.Unmarshal,
258
	Unmarshal: json.Unmarshal,
99
259
}}
259
}}
100
260
260
102
261
func (s *URLSuite) TestCodecs(c *gc.C) {
261
func (s *URLSuite) TestURLCodecs(c *gc.C) {
103
262
	for i, codec := range codecs {
262
	for i, codec := range codecs {
104
263
		c.Logf("codec %d", i)
263
		c.Logf("codec %d", i)
105
264
		type doc struct {
264
		type doc struct {
106
@@ -279,6 +279,25 @@
107
279
	}
279
	}
108
280
}
280
}
109
281
281
110
282
func (s *URLSuite) TestReferenceJSON(c *gc.C) {
111
283
	ref, _, err := charm.ParseReference("cs:series/name")
112
284
	c.Assert(err, gc.IsNil)
113
285
	data, err := json.Marshal(&ref)
114
286
	c.Assert(err, gc.IsNil)
115
287
	c.Check(string(data), gc.Equals, `"cs:name"`)
116
288
117
289
	var parsed charm.Reference
118
290
	err = json.Unmarshal(data, &parsed)
119
291
	c.Assert(err, gc.IsNil)
120
292
	c.Check(parsed, gc.DeepEquals, ref)
121
293
122
294
	// unmarshalling json gibberish and invalid charm reference strings
123
295
	for _, value := range []string{":{", `"cs:{}+<"`, `"cs:~_~/f00^^&^/baaaar$%-?"`} {
124
296
		err = json.Unmarshal([]byte(value), &parsed)
125
297
		c.Check(err, gc.NotNil)
126
298
	}
127
299
}
128
300
129
282
type QuoteSuite struct{}
301
type QuoteSuite struct{}
130
283
302
131
284
var _ = gc.Suite(&QuoteSuite{})
303
var _ = gc.Suite(&QuoteSuite{})
132
285
304
133
=== modified file 'cmd/juju/addmachine.go'
134
--- cmd/juju/addmachine.go	2014-04-01 04:53:43 +0000
135
+++ cmd/juju/addmachine.go	2014-04-03 17:37:27 +0000
136
@@ -12,6 +12,7 @@
137
12
	"launchpad.net/juju-core/cmd"
12
	"launchpad.net/juju-core/cmd"
138
13
	"launchpad.net/juju-core/cmd/envcmd"
13
	"launchpad.net/juju-core/cmd/envcmd"
139
14
	"launchpad.net/juju-core/constraints"
14
	"launchpad.net/juju-core/constraints"
140
15
	"launchpad.net/juju-core/environs/config"
141
15
	"launchpad.net/juju-core/environs/manual"
16
	"launchpad.net/juju-core/environs/manual"
142
16
	"launchpad.net/juju-core/instance"
17
	"launchpad.net/juju-core/instance"
143
17
	"launchpad.net/juju-core/juju"
18
	"launchpad.net/juju-core/juju"
144
@@ -131,7 +132,7 @@
145
131
		if err != nil {
132
		if err != nil {
146
132
			return "", err
133
			return "", err
147
133
		}
134
		}
149
134
		series = conf.DefaultSeries()
135
		series = config.PreferredSeries(conf)
150
135
	}
136
	}
151
136
	template := state.MachineTemplate{
137
	template := state.MachineTemplate{
152
137
		Series:      series,
138
		Series:      series,
153
138
139
154
=== modified file 'cmd/juju/bootstrap_test.go'
155
--- cmd/juju/bootstrap_test.go	2014-04-01 03:11:16 +0000
156
+++ cmd/juju/bootstrap_test.go	2014-04-03 17:37:27 +0000
157
@@ -15,6 +15,7 @@
158
15
	"launchpad.net/juju-core/cmd"
15
	"launchpad.net/juju-core/cmd"
159
16
	"launchpad.net/juju-core/constraints"
16
	"launchpad.net/juju-core/constraints"
160
17
	"launchpad.net/juju-core/environs"
17
	"launchpad.net/juju-core/environs"
161
18
	"launchpad.net/juju-core/environs/config"
162
18
	"launchpad.net/juju-core/environs/configstore"
19
	"launchpad.net/juju-core/environs/configstore"
163
19
	"launchpad.net/juju-core/environs/filestorage"
20
	"launchpad.net/juju-core/environs/filestorage"
164
20
	"launchpad.net/juju-core/environs/imagemetadata"
21
	"launchpad.net/juju-core/environs/imagemetadata"
165
@@ -119,7 +120,8 @@
166
119
func (s *BootstrapSuite) runAllowRetriesTest(c *gc.C, test bootstrapRetryTest) {
120
func (s *BootstrapSuite) runAllowRetriesTest(c *gc.C, test bootstrapRetryTest) {
167
120
	toolsVersions := envtesting.VAll
121
	toolsVersions := envtesting.VAll
168
121
	if test.version != "" {
122
	if test.version != "" {
170
122
		testVersion := version.MustParseBinary(test.version)
123
		useVersion := strings.Replace(test.version, "%LTS%", config.LatestLtsSeries(), 1)
171
124
		testVersion := version.MustParseBinary(useVersion)
172
123
		s.PatchValue(&version.Current, testVersion)
125
		s.PatchValue(&version.Current, testVersion)
173
124
		if test.addVersionToSource {
126
		if test.addVersionToSource {
174
125
			toolsVersions = append([]version.Binary{}, toolsVersions...)
127
			toolsVersions = append([]version.Binary{}, toolsVersions...)
175
@@ -201,8 +203,9 @@
176
201
	defer fake.Restore()
203
	defer fake.Restore()
177
202
204
178
203
	if test.version != "" {
205
	if test.version != "" {
179
206
		useVersion := strings.Replace(test.version, "%LTS%", config.LatestLtsSeries(), 1)
180
204
		origVersion := version.Current
207
		origVersion := version.Current
182
205
		version.Current = version.MustParseBinary(test.version)
208
		version.Current = version.MustParseBinary(useVersion)
183
206
		defer func() { version.Current = origVersion }()
209
		defer func() { version.Current = origVersion }()
184
207
	}
210
	}
185
208
211
186
@@ -217,7 +220,7 @@
187
217
	uploadCount := len(test.uploads)
220
	uploadCount := len(test.uploads)
188
218
	if uploadCount == 0 {
221
	if uploadCount == 0 {
189
219
		usefulVersion := version.Current
222
		usefulVersion := version.Current
191
220
		usefulVersion.Series = env.Config().DefaultSeries()
223
		usefulVersion.Series = config.PreferredSeries(env.Config())
192
221
		envtesting.AssertUploadFakeToolsVersions(c, env.Storage(), usefulVersion)
224
		envtesting.AssertUploadFakeToolsVersions(c, env.Storage(), usefulVersion)
193
222
	}
225
	}
194
223
226
195
@@ -245,6 +248,7 @@
196
245
		urls := list.URLs()
248
		urls := list.URLs()
197
246
		c.Check(urls, gc.HasLen, len(test.uploads))
249
		c.Check(urls, gc.HasLen, len(test.uploads))
198
247
		for _, v := range test.uploads {
250
		for _, v := range test.uploads {
199
251
			v := strings.Replace(v, "%LTS%", config.LatestLtsSeries(), 1)
200
248
			c.Logf("seeking: " + v)
252
			c.Logf("seeking: " + v)
201
249
			vers := version.MustParseBinary(v)
253
			vers := version.MustParseBinary(v)
202
250
			_, found := urls[vers]
254
			_, found := urls[vers]
203
@@ -299,10 +303,9 @@
204
299
	args: []string{"--series", "fine"},
303
	args: []string{"--series", "fine"},
205
300
	err:  `--series requires --upload-tools`,
304
	err:  `--series requires --upload-tools`,
206
301
}, {
305
}, {
211
302
	info:    "bad environment",
306
	info: "bad environment",
212
303
	version: "1.2.3-precise-amd64",
307
	args: []string{"-e", "brokenenv"},
213
304
	args:    []string{"-e", "brokenenv"},
308
	err:  `dummy.Bootstrap is broken`,
210
305
	err:     `dummy.Bootstrap is broken`,
214
306
}, {
309
}, {
215
307
	info:        "constraints",
310
	info:        "constraints",
216
308
	args:        []string{"--constraints", "mem=4G cpu-cores=4"},
311
	args:        []string{"--constraints", "mem=4G cpu-cores=4"},
217
@@ -312,9 +315,9 @@
218
312
	version: "1.2.3-saucy-amd64",
315
	version: "1.2.3-saucy-amd64",
219
313
	args:    []string{"--upload-tools"},
316
	args:    []string{"--upload-tools"},
220
314
	uploads: []string{
317
	uploads: []string{
224
315
		"1.2.3.1-saucy-amd64",   // from version.Current
318
		"1.2.3.1-saucy-amd64",  // from version.Current
225
316
		"1.2.3.1-raring-amd64",  // from env.Config().DefaultSeries()
319
		"1.2.3.1-raring-amd64", // from env.Config().DefaultSeries()
226
317
		"1.2.3.1-precise-amd64", // from environs/config.DefaultSeries
320
		"1.2.3.1-%LTS%-amd64",  // from environs/config.DefaultSeries
227
318
	},
321
	},
228
319
}, {
322
}, {
229
320
	info:     "--upload-tools uses arch from constraint if it matches current version",
323
	info:     "--upload-tools uses arch from constraint if it matches current version",
230
@@ -322,18 +325,18 @@
231
322
	hostArch: "ppc64",
325
	hostArch: "ppc64",
232
323
	args:     []string{"--upload-tools", "--constraints", "arch=ppc64"},
326
	args:     []string{"--upload-tools", "--constraints", "arch=ppc64"},
233
324
	uploads: []string{
327
	uploads: []string{
237
325
		"1.3.3.1-saucy-ppc64",   // from version.Current
328
		"1.3.3.1-saucy-ppc64",  // from version.Current
238
326
		"1.3.3.1-raring-ppc64",  // from env.Config().DefaultSeries()
329
		"1.3.3.1-raring-ppc64", // from env.Config().DefaultSeries()
239
327
		"1.3.3.1-precise-ppc64", // from environs/config.DefaultSeries
330
		"1.3.3.1-%LTS%-ppc64",  // from environs/config.DefaultSeries
240
328
	},
331
	},
241
329
	constraints: constraints.MustParse("arch=ppc64"),
332
	constraints: constraints.MustParse("arch=ppc64"),
242
330
}, {
333
}, {
243
331
	info:    "--upload-tools only uploads each file once",
334
	info:    "--upload-tools only uploads each file once",
245
332
	version: "1.2.3-precise-amd64",
335
	version: "1.2.3-%LTS%-amd64",
246
333
	args:    []string{"--upload-tools"},
336
	args:    []string{"--upload-tools"},
247
334
	uploads: []string{
337
	uploads: []string{
248
335
		"1.2.3.1-raring-amd64",
338
		"1.2.3.1-raring-amd64",
250
336
		"1.2.3.1-precise-amd64",
339
		"1.2.3.1-%LTS%-amd64",
251
337
	},
340
	},
252
338
}, {
341
}, {
253
339
	info:    "--upload-tools rejects invalid series",
342
	info:    "--upload-tools rejects invalid series",
254
@@ -357,7 +360,7 @@
255
357
	args:    []string{"--upload-tools"},
360
	args:    []string{"--upload-tools"},
256
358
	uploads: []string{
361
	uploads: []string{
257
359
		"1.2.3.5-raring-amd64",
362
		"1.2.3.5-raring-amd64",
259
360
		"1.2.3.5-precise-amd64",
363
		"1.2.3.5-%LTS%-amd64",
260
361
	},
364
	},
261
362
}}
365
}}
262
363
366
263
@@ -365,7 +368,7 @@
264
365
	env, fake := makeEmptyFakeHome(c)
368
	env, fake := makeEmptyFakeHome(c)
265
366
	defer fake.Restore()
369
	defer fake.Restore()
266
367
	defaultSeriesVersion := version.Current
370
	defaultSeriesVersion := version.Current
268
368
	defaultSeriesVersion.Series = env.Config().DefaultSeries()
371
	defaultSeriesVersion.Series = config.PreferredSeries(env.Config())
269
369
372
270
370
	ctx := coretesting.Context(c)
373
	ctx := coretesting.Context(c)
271
371
	code := cmd.Main(&BootstrapCommand{}, ctx, nil)
374
	code := cmd.Main(&BootstrapCommand{}, ctx, nil)
272
@@ -383,7 +386,7 @@
273
383
	env, fake := makeEmptyFakeHome(c)
386
	env, fake := makeEmptyFakeHome(c)
274
384
	defer fake.Restore()
387
	defer fake.Restore()
275
385
	defaultSeriesVersion := version.Current
388
	defaultSeriesVersion := version.Current
277
386
	defaultSeriesVersion.Series = env.Config().DefaultSeries()
389
	defaultSeriesVersion.Series = config.PreferredSeries(env.Config())
278
387
390
279
388
	store, err := configstore.Default()
391
	store, err := configstore.Default()
280
389
	c.Assert(err, gc.IsNil)
392
	c.Assert(err, gc.IsNil)
281
@@ -515,7 +518,13 @@
282
515
	c.Assert(err, gc.IsNil)
518
	c.Assert(err, gc.IsNil)
283
516
	c.Logf("found: " + list.String())
519
	c.Logf("found: " + list.String())
284
517
	urls := list.URLs()
520
	urls := list.URLs()
286
518
	c.Assert(urls, gc.HasLen, 2)
521
	expectedUrlCount := 2
287
522
288
523
	// There will be distinct tools for each of these if they are different
289
524
	if config.LatestLtsSeries() != coretesting.FakeDefaultSeries {
290
525
		expectedUrlCount++
291
526
	}
292
527
	c.Assert(urls, gc.HasLen, expectedUrlCount)
293
519
	expectedVers := []version.Binary{
528
	expectedVers := []version.Binary{
294
520
		version.MustParseBinary(fmt.Sprintf("1.7.3.1-%s-%s", otherSeries, version.Current.Arch)),
529
		version.MustParseBinary(fmt.Sprintf("1.7.3.1-%s-%s", otherSeries, version.Current.Arch)),
295
521
		version.MustParseBinary(fmt.Sprintf("1.7.3.1-%s-%s", version.Current.Series, version.Current.Arch)),
530
		version.MustParseBinary(fmt.Sprintf("1.7.3.1-%s-%s", version.Current.Series, version.Current.Arch)),
296
@@ -556,7 +565,11 @@
297
556
	code := cmd.Main(&BootstrapCommand{}, context, nil)
565
	code := cmd.Main(&BootstrapCommand{}, context, nil)
298
557
	c.Assert(code, gc.Equals, 1)
566
	c.Assert(code, gc.Equals, 1)
299
558
	errText := context.Stderr.(*bytes.Buffer).String()
567
	errText := context.Stderr.(*bytes.Buffer).String()
301
559
	expectedErrText := "uploading tools for series \\[precise raring\\]\n"
568
	expectedErrText := "uploading tools for series \\[precise "
302
569
	if config.LatestLtsSeries() != coretesting.FakeDefaultSeries {
303
570
		expectedErrText += config.LatestLtsSeries() + " "
304
571
	}
305
572
	expectedErrText += "raring\\]\n"
306
560
	expectedErrText += "error: cannot upload bootstrap tools: an error\n"
573
	expectedErrText += "error: cannot upload bootstrap tools: an error\n"
307
561
	c.Assert(errText, gc.Matches, expectedErrText)
574
	c.Assert(errText, gc.Matches, expectedErrText)
308
562
}
575
}
309
563
576
310
=== modified file 'cmd/juju/common.go'
311
--- cmd/juju/common.go	2014-03-26 04:36:17 +0000
312
+++ cmd/juju/common.go	2014-04-03 17:37:27 +0000
313
@@ -4,10 +4,13 @@
314
4
package main
4
package main
315
5
5
316
6
import (
6
import (
317
7
	"launchpad.net/juju-core/charm"
318
7
	"launchpad.net/juju-core/cmd"
8
	"launchpad.net/juju-core/cmd"
319
8
	"launchpad.net/juju-core/environs"
9
	"launchpad.net/juju-core/environs"
320
10
	"launchpad.net/juju-core/environs/config"
321
9
	"launchpad.net/juju-core/environs/configstore"
11
	"launchpad.net/juju-core/environs/configstore"
322
10
	"launchpad.net/juju-core/errors"
12
	"launchpad.net/juju-core/errors"
323
13
	"launchpad.net/juju-core/state/api"
324
11
)
14
)
325
12
15
326
13
// destroyPreparedEnviron destroys the environment and logs an error if it fails.
16
// destroyPreparedEnviron destroys the environment and logs an error if it fails.
327
@@ -45,3 +48,39 @@
328
45
	}
48
	}
329
46
	return environ, cleanup, nil
49
	return environ, cleanup, nil
330
47
}
50
}
331
51
332
52
// resolveCharmURL returns a resolved charm URL, given a charm location string.
333
53
// If the series is not resolved, the environment default-series is used, or if
334
54
// not set, the series is resolved with the state server.
335
55
func resolveCharmURL(url string, client *api.Client, conf *config.Config) (*charm.URL, error) {
336
56
	ref, series, err := charm.ParseReference(url)
337
57
	if err != nil {
338
58
		return nil, err
339
59
	}
340
60
	// If series is not set, use configured default series
341
61
	if series == "" {
342
62
		if defaultSeries, ok := conf.DefaultSeries(); ok {
343
63
			series = defaultSeries
344
64
		}
345
65
	}
346
66
	// Otherwise, look up the best supported series for this charm
347
67
	if series == "" {
348
68
		return client.ResolveCharm(ref)
349
69
	}
350
70
	return &charm.URL{Reference: ref, Series: series}, nil
351
71
}
352
72
353
73
// resolveCharmURL1dot16 returns a resolved charm URL for older state servers
354
74
// that do not support ResolveCharm. The default series "precise" is
355
75
// appropriate for these environments.
356
76
func resolveCharmURL1dot16(url string, conf *config.Config) (*charm.URL, error) {
357
77
	ref, series, err := charm.ParseReference(url)
358
78
	if err != nil {
359
79
		return nil, err
360
80
	}
361
81
362
82
	if series == "" {
363
83
		series = config.PreferredSeries(conf)
364
84
	}
365
85
	return &charm.URL{Reference: ref, Series: series}, err
366
86
}
367
48
87
368
=== modified file 'cmd/juju/deploy.go'
369
--- cmd/juju/deploy.go	2014-04-01 14:55:36 +0000
370
+++ cmd/juju/deploy.go	2014-04-03 17:37:27 +0000
371
@@ -154,11 +154,13 @@
372
154
	if err != nil {
154
	if err != nil {
373
155
		return err
155
		return err
374
156
	}
156
	}
376
157
	curl, err := charm.InferURL(c.CharmName, conf.DefaultSeries())
157
377
158
	curl, err := resolveCharmURL(c.CharmName, client, conf)
378
158
	if err != nil {
159
	if err != nil {
379
159
		return err
160
		return err
380
160
	}
161
	}
382
161
	repo, err := charm.InferRepository(curl, ctx.AbsPath(c.RepoPath))
162
383
163
	repo, err := charm.InferRepository(curl.Reference, ctx.AbsPath(c.RepoPath))
384
162
	if err != nil {
164
	if err != nil {
385
163
		return err
165
		return err
386
164
	}
166
	}
387
@@ -260,15 +262,16 @@
388
260
	if err != nil {
262
	if err != nil {
389
261
		return err
263
		return err
390
262
	}
264
	}
400
263
	curl, err := charm.InferURL(c.CharmName, conf.DefaultSeries())
265
401
264
	if err != nil {
266
	curl, err := resolveCharmURL1dot16(c.CharmName, conf)
402
265
		return err
267
	if err != nil {
403
266
	}
268
		return err
404
267
	repo, err := charm.InferRepository(curl, ctx.AbsPath(c.RepoPath))
269
	}
405
268
	if err != nil {
270
406
269
		return err
271
	repo, err := charm.InferRepository(curl.Reference, c.RepoPath)
407
270
	}
272
	if err != nil {
408
271
273
		return err
409
274
	}
410
272
	repo = config.SpecializeCharmRepo(repo, conf)
275
	repo = config.SpecializeCharmRepo(repo, conf)
411
273
276
412
274
	// TODO(fwereade) it's annoying to roundtrip the bytes through the client
277
	// TODO(fwereade) it's annoying to roundtrip the bytes through the client
413
275
278
414
=== modified file 'cmd/juju/environment_test.go'
415
--- cmd/juju/environment_test.go	2014-03-26 05:44:41 +0000
416
+++ cmd/juju/environment_test.go	2014-04-03 17:37:27 +0000
417
@@ -124,12 +124,22 @@
418
124
}
124
}
419
125
125
420
126
func (s *SetEnvironmentSuite) TestChangeDefaultSeries(c *gc.C) {
126
func (s *SetEnvironmentSuite) TestChangeDefaultSeries(c *gc.C) {
424
127
	_, err := testing.RunCommand(c, &SetEnvironmentCommand{}, []string{"default-series=raring"})
127
	// default-series not set
422
128
	c.Assert(err, gc.IsNil)
423
129
425
130
	stateConfig, err := s.State.EnvironConfig()
128
	stateConfig, err := s.State.EnvironConfig()
426
131
	c.Assert(err, gc.IsNil)
129
	c.Assert(err, gc.IsNil)
428
132
	c.Assert(stateConfig.DefaultSeries(), gc.Equals, "raring")
130
	series, ok := stateConfig.DefaultSeries()
429
131
	c.Assert(ok, gc.Equals, true)
430
132
	c.Assert(series, gc.Equals, "precise") // default-series set in RepoSuite.SetUpTest
431
133
432
134
	_, err = testing.RunCommand(c, &SetEnvironmentCommand{}, []string{"default-series=raring"})
433
135
	c.Assert(err, gc.IsNil)
434
136
435
137
	stateConfig, err = s.State.EnvironConfig()
436
138
	c.Assert(err, gc.IsNil)
437
139
	series, ok = stateConfig.DefaultSeries()
438
140
	c.Assert(ok, gc.Equals, true)
439
141
	c.Assert(series, gc.Equals, "raring")
440
142
	c.Assert(config.PreferredSeries(stateConfig), gc.Equals, "raring")
441
133
}
143
}
442
134
144
443
135
func (s *SetEnvironmentSuite) TestChangeBooleanAttribute(c *gc.C) {
145
func (s *SetEnvironmentSuite) TestChangeBooleanAttribute(c *gc.C) {
444
136
146
445
=== modified file 'cmd/juju/publish.go'
446
--- cmd/juju/publish.go	2014-04-01 04:53:43 +0000
447
+++ cmd/juju/publish.go	2014-04-03 17:37:27 +0000
448
@@ -115,7 +115,7 @@
449
115
		pushLocation = c.changePushLocation(pushLocation)
115
		pushLocation = c.changePushLocation(pushLocation)
450
116
	}
116
	}
451
117
117
453
118
	repo, err := charm.InferRepository(curl, "/not/important")
118
	repo, err := charm.InferRepository(curl.Reference, "/not/important")
454
119
	if err != nil {
119
	if err != nil {
455
120
		return err
120
		return err
456
121
	}
121
	}
457
122
122
458
=== modified file 'cmd/juju/upgradecharm.go'
459
--- cmd/juju/upgradecharm.go	2014-04-01 04:53:43 +0000
460
+++ cmd/juju/upgradecharm.go	2014-04-03 17:37:27 +0000
461
@@ -134,8 +134,7 @@
462
134
134
463
135
	var newURL *charm.URL
135
	var newURL *charm.URL
464
136
	if c.SwitchURL != "" {
136
	if c.SwitchURL != "" {
467
137
		// A new charm URL was explicitly specified.
137
		newURL, err = resolveCharmURL(c.SwitchURL, client, conf)
466
138
		newURL, err = charm.InferURL(c.SwitchURL, conf.DefaultSeries())
468
139
		if err != nil {
138
		if err != nil {
469
140
			return err
139
			return err
470
141
		}
140
		}
471
@@ -143,11 +142,11 @@
472
143
		// No new URL specified, but revision might have been.
142
		// No new URL specified, but revision might have been.
473
144
		newURL = oldURL.WithRevision(c.Revision)
143
		newURL = oldURL.WithRevision(c.Revision)
474
145
	}
144
	}
476
146
	repo, err := charm.InferRepository(newURL, ctx.AbsPath(c.RepoPath))
145
477
146
	repo, err := charm.InferRepository(newURL.Reference, ctx.AbsPath(c.RepoPath))
478
147
	if err != nil {
147
	if err != nil {
479
148
		return err
148
		return err
480
149
	}
149
	}
481
150
482
151
	repo = config.SpecializeCharmRepo(repo, conf)
150
	repo = config.SpecializeCharmRepo(repo, conf)
483
152
151
484
153
	// If no explicit revision was set with either SwitchURL
152
	// If no explicit revision was set with either SwitchURL
485
@@ -203,11 +202,7 @@
486
203
	var newURL *charm.URL
202
	var newURL *charm.URL
487
204
	if c.SwitchURL != "" {
203
	if c.SwitchURL != "" {
488
205
		// A new charm URL was explicitly specified.
204
		// A new charm URL was explicitly specified.
494
206
		conf, err := conn.State.EnvironConfig()
205
		newURL, err = resolveCharmURL1dot16(c.SwitchURL, conf)
490
207
		if err != nil {
491
208
			return err
492
209
		}
493
210
		newURL, err = charm.InferURL(c.SwitchURL, conf.DefaultSeries())
495
211
		if err != nil {
206
		if err != nil {
496
212
			return err
207
			return err
497
213
		}
208
		}
498
@@ -215,11 +210,11 @@
499
215
		// No new URL specified, but revision might have been.
210
		// No new URL specified, but revision might have been.
500
216
		newURL = oldURL.WithRevision(c.Revision)
211
		newURL = oldURL.WithRevision(c.Revision)
501
217
	}
212
	}
503
218
	repo, err := charm.InferRepository(newURL, ctx.AbsPath(c.RepoPath))
213
504
214
	repo, err := charm.InferRepository(newURL.Reference, ctx.AbsPath(c.RepoPath))
505
219
	if err != nil {
215
	if err != nil {
506
220
		return err
216
		return err
507
221
	}
217
	}
508
222
509
223
	repo = config.SpecializeCharmRepo(repo, conf)
218
	repo = config.SpecializeCharmRepo(repo, conf)
510
224
219
511
225
	// If no explicit revision was set with either SwitchURL
220
	// If no explicit revision was set with either SwitchURL
512
226
221
513
=== modified file 'cmd/juju/upgradejuju_test.go'
514
--- cmd/juju/upgradejuju_test.go	2014-03-17 06:05:54 +0000
515
+++ cmd/juju/upgradejuju_test.go	2014-04-03 17:37:27 +0000
516
@@ -14,6 +14,7 @@
517
14
	jc "github.com/juju/testing/checkers"
14
	jc "github.com/juju/testing/checkers"
518
15
	gc "launchpad.net/gocheck"
15
	gc "launchpad.net/gocheck"
519
16
16
520
17
	"launchpad.net/juju-core/environs/config"
521
17
	"launchpad.net/juju-core/environs/filestorage"
18
	"launchpad.net/juju-core/environs/filestorage"
522
18
	"launchpad.net/juju-core/environs/storage"
19
	"launchpad.net/juju-core/environs/storage"
523
19
	"launchpad.net/juju-core/environs/sync"
20
	"launchpad.net/juju-core/environs/sync"
524
@@ -225,14 +226,14 @@
525
225
	agentVersion:   "2.0.0",
226
	agentVersion:   "2.0.0",
526
226
	args:           []string{"--upload-tools"},
227
	args:           []string{"--upload-tools"},
527
227
	expectVersion:  "2.2.0.1",
228
	expectVersion:  "2.2.0.1",
529
228
	expectUploaded: []string{"2.2.0.1-quantal-amd64", "2.2.0.1-precise-amd64", "2.2.0.1-raring-amd64"},
229
	expectUploaded: []string{"2.2.0.1-quantal-amd64", "2.2.0.1-%LTS%-amd64", "2.2.0.1-raring-amd64"},
530
229
}, {
230
}, {
531
230
	about:          "upload with explicit version",
231
	about:          "upload with explicit version",
532
231
	currentVersion: "2.2.0-quantal-amd64",
232
	currentVersion: "2.2.0-quantal-amd64",
533
232
	agentVersion:   "2.0.0",
233
	agentVersion:   "2.0.0",
534
233
	args:           []string{"--upload-tools", "--version", "2.7.3"},
234
	args:           []string{"--upload-tools", "--version", "2.7.3"},
535
234
	expectVersion:  "2.7.3.1",
235
	expectVersion:  "2.7.3.1",
537
235
	expectUploaded: []string{"2.7.3.1-quantal-amd64", "2.7.3.1-precise-amd64", "2.7.3.1-raring-amd64"},
236
	expectUploaded: []string{"2.7.3.1-quantal-amd64", "2.7.3.1-%LTS%-amd64", "2.7.3.1-raring-amd64"},
538
236
}, {
237
}, {
539
237
	about:          "upload with explicit series",
238
	about:          "upload with explicit series",
540
238
	currentVersion: "2.2.0-quantal-amd64",
239
	currentVersion: "2.2.0-quantal-amd64",
541
@@ -246,7 +247,7 @@
542
246
	agentVersion:   "2.0.0",
247
	agentVersion:   "2.0.0",
543
247
	args:           []string{"--upload-tools"},
248
	args:           []string{"--upload-tools"},
544
248
	expectVersion:  "2.1.0.1",
249
	expectVersion:  "2.1.0.1",
546
249
	expectUploaded: []string{"2.1.0.1-quantal-amd64", "2.1.0.1-precise-amd64", "2.1.0.1-raring-amd64"},
250
	expectUploaded: []string{"2.1.0.1-quantal-amd64", "2.1.0.1-%LTS%-amd64", "2.1.0.1-raring-amd64"},
547
250
}, {
251
}, {
548
251
	about:          "upload bumps version when necessary",
252
	about:          "upload bumps version when necessary",
549
252
	tools:          []string{"2.4.6-quantal-amd64", "2.4.8-quantal-amd64"},
253
	tools:          []string{"2.4.6-quantal-amd64", "2.4.8-quantal-amd64"},
550
@@ -254,7 +255,7 @@
551
254
	agentVersion:   "2.4.0",
255
	agentVersion:   "2.4.0",
552
255
	args:           []string{"--upload-tools"},
256
	args:           []string{"--upload-tools"},
553
256
	expectVersion:  "2.4.6.1",
257
	expectVersion:  "2.4.6.1",
555
257
	expectUploaded: []string{"2.4.6.1-quantal-amd64", "2.4.6.1-precise-amd64", "2.4.6.1-raring-amd64"},
258
	expectUploaded: []string{"2.4.6.1-quantal-amd64", "2.4.6.1-%LTS%-amd64", "2.4.6.1-raring-amd64"},
556
258
}, {
259
}, {
557
259
	about:          "upload re-bumps version when necessary",
260
	about:          "upload re-bumps version when necessary",
558
260
	tools:          []string{"2.4.6-quantal-amd64", "2.4.6.2-saucy-i386", "2.4.8-quantal-amd64"},
261
	tools:          []string{"2.4.6-quantal-amd64", "2.4.6.2-saucy-i386", "2.4.8-quantal-amd64"},
559
@@ -262,7 +263,7 @@
560
262
	agentVersion:   "2.4.6.2",
263
	agentVersion:   "2.4.6.2",
561
263
	args:           []string{"--upload-tools"},
264
	args:           []string{"--upload-tools"},
562
264
	expectVersion:  "2.4.6.3",
265
	expectVersion:  "2.4.6.3",
564
265
	expectUploaded: []string{"2.4.6.3-quantal-amd64", "2.4.6.3-precise-amd64", "2.4.6.3-raring-amd64"},
266
	expectUploaded: []string{"2.4.6.3-quantal-amd64", "2.4.6.3-%LTS%-amd64", "2.4.6.3-raring-amd64"},
565
266
}, {
267
}, {
566
267
	about:          "upload with explicit version bumps when necessary",
268
	about:          "upload with explicit version bumps when necessary",
567
268
	currentVersion: "2.2.0-quantal-amd64",
269
	currentVersion: "2.2.0-quantal-amd64",
568
@@ -270,7 +271,7 @@
569
270
	agentVersion:   "2.0.0",
271
	agentVersion:   "2.0.0",
570
271
	args:           []string{"--upload-tools", "--version", "2.7.3"},
272
	args:           []string{"--upload-tools", "--version", "2.7.3"},
571
272
	expectVersion:  "2.7.3.2",
273
	expectVersion:  "2.7.3.2",
573
273
	expectUploaded: []string{"2.7.3.2-quantal-amd64", "2.7.3.2-precise-amd64", "2.7.3.2-raring-amd64"},
274
	expectUploaded: []string{"2.7.3.2-quantal-amd64", "2.7.3.2-%LTS%-amd64", "2.7.3.2-raring-amd64"},
574
274
}}
275
}}
575
275
276
576
276
// getMockBuildTools returns a sync.BuildToolsTarballFunc implementation which generates
277
// getMockBuildTools returns a sync.BuildToolsTarballFunc implementation which generates
577
@@ -356,6 +357,9 @@
578
356
		c.Check(agentVersion, gc.Equals, version.MustParse(test.expectVersion))
357
		c.Check(agentVersion, gc.Equals, version.MustParse(test.expectVersion))
579
357
358
580
358
		for _, uploaded := range test.expectUploaded {
359
		for _, uploaded := range test.expectUploaded {
581
360
			// Substitute latest LTS for placeholder in expected series for uploaded tools
582
361
			uploaded = strings.Replace(uploaded, "%LTS%", config.LatestLtsSeries(), 1)
583
362
584
359
			vers := version.MustParseBinary(uploaded)
363
			vers := version.MustParseBinary(uploaded)
585
360
			r, err := storage.Get(s.Conn.Environ.Storage(), envtools.StorageName(vers))
364
			r, err := storage.Get(s.Conn.Environ.Storage(), envtools.StorageName(vers))
586
361
			if !c.Check(err, gc.IsNil) {
365
			if !c.Check(err, gc.IsNil) {
587
362
366
588
=== modified file 'cmd/plugins/juju-metadata/imagemetadata.go'
589
--- cmd/plugins/juju-metadata/imagemetadata.go	2014-03-28 12:28:30 +0000
590
+++ cmd/plugins/juju-metadata/imagemetadata.go	2014-04-03 17:37:27 +0000
591
@@ -97,7 +97,7 @@
592
97
			}
97
			}
593
98
			cfg := environ.Config()
98
			cfg := environ.Config()
594
99
			if c.Series == "" {
99
			if c.Series == "" {
596
100
				c.Series = cfg.DefaultSeries()
100
				c.Series = config.PreferredSeries(cfg)
597
101
			}
101
			}
598
102
			if v, ok := cfg.AllAttrs()["control-bucket"]; ok {
102
			if v, ok := cfg.AllAttrs()["control-bucket"]; ok {
599
103
				c.privateStorage = v.(string)
103
				c.privateStorage = v.(string)
600
@@ -110,7 +110,7 @@
601
110
		logger.Infof("no environment found, creating image metadata using user supplied data")
110
		logger.Infof("no environment found, creating image metadata using user supplied data")
602
111
	}
111
	}
603
112
	if c.Series == "" {
112
	if c.Series == "" {
605
113
		c.Series = config.DefaultSeries
113
		c.Series = config.LatestLtsSeries()
606
114
	}
114
	}
607
115
	if c.ImageId == "" {
115
	if c.ImageId == "" {
608
116
		return fmt.Errorf("image id must be specified")
116
		return fmt.Errorf("image id must be specified")
609
117
117
610
=== modified file 'cmd/plugins/juju-metadata/imagemetadata_test.go'
611
--- cmd/plugins/juju-metadata/imagemetadata_test.go	2014-03-13 07:54:56 +0000
612
+++ cmd/plugins/juju-metadata/imagemetadata_test.go	2014-04-03 17:37:27 +0000
613
@@ -15,6 +15,7 @@
614
15
	gc "launchpad.net/gocheck"
15
	gc "launchpad.net/gocheck"
615
16
16
616
17
	"launchpad.net/juju-core/cmd"
17
	"launchpad.net/juju-core/cmd"
617
18
	"launchpad.net/juju-core/environs/config"
618
18
	"launchpad.net/juju-core/testing"
19
	"launchpad.net/juju-core/testing"
619
19
	"launchpad.net/juju-core/testing/testbase"
20
	"launchpad.net/juju-core/testing/testbase"
620
20
)
21
)
621
@@ -61,6 +62,7 @@
622
61
var seriesVersions map[string]string = map[string]string{
62
var seriesVersions map[string]string = map[string]string{
623
62
	"precise": "12.04",
63
	"precise": "12.04",
624
63
	"raring":  "13.04",
64
	"raring":  "13.04",
625
65
	"trusty":  "14.04",
626
64
}
66
}
627
65
67
628
66
type expectedMetadata struct {
68
type expectedMetadata struct {
629
@@ -138,7 +140,7 @@
630
138
	s.assertCommandOutput(c, expected, out, defaultIndexFileName, defaultImageFileName)
140
	s.assertCommandOutput(c, expected, out, defaultIndexFileName, defaultImageFileName)
631
139
}
141
}
632
140
142
634
141
func (s *ImageMetadataSuite) TestImageMetadataFilesDefaultSeries(c *gc.C) {
143
func (s *ImageMetadataSuite) TestImageMetadataFilesLatestLts(c *gc.C) {
635
142
	ctx := testing.Context(c)
144
	ctx := testing.Context(c)
636
143
	code := cmd.Main(
145
	code := cmd.Main(
637
144
		&ImageMetadataCommand{}, ctx, []string{
146
		&ImageMetadataCommand{}, ctx, []string{
638
@@ -146,7 +148,7 @@
639
146
	c.Assert(code, gc.Equals, 0)
148
	c.Assert(code, gc.Equals, 0)
640
147
	out := testing.Stdout(ctx)
149
	out := testing.Stdout(ctx)
641
148
	expected := expectedMetadata{
150
	expected := expectedMetadata{
643
149
		series: "precise",
151
		series: config.LatestLtsSeries(),
644
150
		arch:   "arch",
152
		arch:   "arch",
645
151
	}
153
	}
646
152
	s.assertCommandOutput(c, expected, out, defaultIndexFileName, defaultImageFileName)
154
	s.assertCommandOutput(c, expected, out, defaultIndexFileName, defaultImageFileName)
647
153
155
648
=== modified file 'environs/bootstrap/bootstrap_test.go'
649
--- environs/bootstrap/bootstrap_test.go	2014-03-28 13:27:45 +0000
650
+++ environs/bootstrap/bootstrap_test.go	2014-04-03 17:37:27 +0000
651
@@ -88,7 +88,7 @@
652
88
88
653
89
func uploadTools(c *gc.C, env environs.Environ) {
89
func uploadTools(c *gc.C, env environs.Environ) {
654
90
	usefulVersion := version.Current
90
	usefulVersion := version.Current
656
91
	usefulVersion.Series = env.Config().DefaultSeries()
91
	usefulVersion.Series = config.PreferredSeries(env.Config())
657
92
	envtesting.AssertUploadFakeToolsVersions(c, env.Storage(), usefulVersion)
92
	envtesting.AssertUploadFakeToolsVersions(c, env.Storage(), usefulVersion)
658
93
}
93
}
659
94
94
660
@@ -217,7 +217,7 @@
661
217
	s.setDummyStorage(c, env)
217
	s.setDummyStorage(c, env)
662
218
	envtesting.RemoveFakeTools(c, env.Storage())
218
	envtesting.RemoveFakeTools(c, env.Storage())
663
219
	arch := "ppc64"
219
	arch := "ppc64"
665
220
	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), &arch)
220
	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), &arch)
666
221
	c.Assert(err, gc.NotNil)
221
	c.Assert(err, gc.NotNil)
667
222
	stripped := strings.Replace(err.Error(), "\n", "", -1)
222
	stripped := strings.Replace(err.Error(), "\n", "", -1)
668
223
	c.Assert(stripped,
223
	c.Assert(stripped,
669
@@ -233,7 +233,7 @@
670
233
	env := newEnviron("foo", useDefaultKeys, nil)
233
	env := newEnviron("foo", useDefaultKeys, nil)
671
234
	s.setDummyStorage(c, env)
234
	s.setDummyStorage(c, env)
672
235
	envtesting.RemoveFakeTools(c, env.Storage())
235
	envtesting.RemoveFakeTools(c, env.Storage())
674
236
	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), nil)
236
	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), nil)
675
237
	c.Assert(err, gc.NotNil)
237
	c.Assert(err, gc.NotNil)
676
238
	stripped := strings.Replace(err.Error(), "\n", "", -1)
238
	stripped := strings.Replace(err.Error(), "\n", "", -1)
677
239
	c.Assert(stripped,
239
	c.Assert(stripped,
678
@@ -246,7 +246,7 @@
679
246
	env := newEnviron("foo", useDefaultKeys, map[string]interface{}{"agent-version": "1.16.0"})
246
	env := newEnviron("foo", useDefaultKeys, map[string]interface{}{"agent-version": "1.16.0"})
680
247
	s.setDummyStorage(c, env)
247
	s.setDummyStorage(c, env)
681
248
	envtesting.RemoveFakeTools(c, env.Storage())
248
	envtesting.RemoveFakeTools(c, env.Storage())
683
249
	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), nil)
249
	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), nil)
684
250
	c.Assert(err, gc.NotNil)
250
	c.Assert(err, gc.NotNil)
685
251
	stripped := strings.Replace(err.Error(), "\n", "", -1)
251
	stripped := strings.Replace(err.Error(), "\n", "", -1)
686
252
	c.Assert(stripped,
252
	c.Assert(stripped,
687
@@ -260,7 +260,7 @@
688
260
	env := newEnviron("foo", useDefaultKeys, nil)
260
	env := newEnviron("foo", useDefaultKeys, nil)
689
261
	s.setDummyStorage(c, env)
261
	s.setDummyStorage(c, env)
690
262
	envtesting.RemoveFakeTools(c, env.Storage())
262
	envtesting.RemoveFakeTools(c, env.Storage())
692
263
	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), nil)
263
	_, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), nil)
693
264
	c.Assert(err, gc.NotNil)
264
	c.Assert(err, gc.NotNil)
694
265
	stripped := strings.Replace(err.Error(), "\n", "", -1)
265
	stripped := strings.Replace(err.Error(), "\n", "", -1)
695
266
	c.Assert(stripped,
266
	c.Assert(stripped,
696
@@ -310,12 +310,12 @@
697
310
		return "arm64"
310
		return "arm64"
698
311
	})
311
	})
699
312
	arch := "arm64"
312
	arch := "arm64"
701
313
	agentTools, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, env.Config().DefaultSeries(), &arch)
313
	agentTools, err := bootstrap.EnsureToolsAvailability(coretesting.Context(c), env, config.PreferredSeries(env.Config()), &arch)
702
314
	c.Assert(err, gc.IsNil)
314
	c.Assert(err, gc.IsNil)
703
315
	c.Assert(agentTools, gc.HasLen, 1)
315
	c.Assert(agentTools, gc.HasLen, 1)
704
316
	expectedVers := version.Current
316
	expectedVers := version.Current
705
317
	expectedVers.Number.Build++
317
	expectedVers.Number.Build++
707
318
	expectedVers.Series = env.Config().DefaultSeries()
318
	expectedVers.Series = config.PreferredSeries(env.Config())
708
319
	c.Assert(agentTools[0].Version, gc.DeepEquals, expectedVers)
319
	c.Assert(agentTools[0].Version, gc.DeepEquals, expectedVers)
709
320
}
320
}
710
321
321
711
@@ -325,11 +325,18 @@
712
325
	s.PatchValue(&version.Current, vers)
325
	s.PatchValue(&version.Current, vers)
713
326
	env := newEnviron("foo", useDefaultKeys, nil)
326
	env := newEnviron("foo", useDefaultKeys, nil)
714
327
	cfg := env.Config()
327
	cfg := env.Config()
716
328
	c.Assert(bootstrap.SeriesToUpload(cfg, nil), jc.SameContents, []string{"quantal", "precise"})
328
717
329
	prefSeries := config.PreferredSeries(cfg)
718
330
	expect := []string{"quantal", prefSeries}
719
331
	if prefSeries != config.LatestLtsSeries() {
720
332
		expect = append(expect, config.LatestLtsSeries())
721
333
	}
722
334
	c.Assert(bootstrap.SeriesToUpload(cfg, nil), jc.SameContents, expect)
723
335
724
329
	c.Assert(bootstrap.SeriesToUpload(cfg, []string{"quantal"}), jc.SameContents, []string{"quantal"})
336
	c.Assert(bootstrap.SeriesToUpload(cfg, []string{"quantal"}), jc.SameContents, []string{"quantal"})
725
330
	env = newEnviron("foo", useDefaultKeys, map[string]interface{}{"default-series": "lucid"})
337
	env = newEnviron("foo", useDefaultKeys, map[string]interface{}{"default-series": "lucid"})
726
331
	cfg = env.Config()
338
	cfg = env.Config()
728
332
	c.Assert(bootstrap.SeriesToUpload(cfg, nil), jc.SameContents, []string{"quantal", "precise", "lucid"})
339
	c.Assert(bootstrap.SeriesToUpload(cfg, nil), jc.SameContents, []string{"quantal", config.LatestLtsSeries(), "lucid"})
729
333
}
340
}
730
334
341
731
335
func (s *bootstrapSuite) assertUploadTools(c *gc.C, vers version.Binary, allowRelease bool,
342
func (s *bootstrapSuite) assertUploadTools(c *gc.C, vers version.Binary, allowRelease bool,
732
336
343
733
=== modified file 'environs/bootstrap/synctools.go'
734
--- environs/bootstrap/synctools.go	2014-03-26 03:30:35 +0000
735
+++ environs/bootstrap/synctools.go	2014-04-03 17:37:27 +0000
736
@@ -100,8 +100,10 @@
737
100
	unique := set.NewStrings(series...)
100
	unique := set.NewStrings(series...)
738
101
	if unique.IsEmpty() {
101
	if unique.IsEmpty() {
739
102
		unique.Add(version.Current.Series)
102
		unique.Add(version.Current.Series)
742
103
		unique.Add(config.DefaultSeries)
103
		unique.Add(config.LatestLtsSeries())
743
104
		unique.Add(cfg.DefaultSeries())
104
		if series, ok := cfg.DefaultSeries(); ok {
744
105
			unique.Add(series)
745
106
		}
746
105
	}
107
	}
747
106
	return unique.Values()
108
	return unique.Values()
748
107
}
109
}
749
@@ -175,7 +177,10 @@
750
175
	// No tools available so our only hope is to build locally and upload.
177
	// No tools available so our only hope is to build locally and upload.
751
176
	logger.Warningf("no prepackaged tools available")
178
	logger.Warningf("no prepackaged tools available")
752
177
	uploadSeries := SeriesToUpload(cfg, nil)
179
	uploadSeries := SeriesToUpload(cfg, nil)
754
178
	if err := UploadTools(ctx, env, toolsArch, false, append(uploadSeries, series)...); err != nil {
180
	if series != "" {
755
181
		uploadSeries = append(uploadSeries, series)
756
182
	}
757
183
	if err := UploadTools(ctx, env, toolsArch, false, uploadSeries...); err != nil {
758
179
		logger.Errorf("%s", noToolsMessage)
184
		logger.Errorf("%s", noToolsMessage)
759
180
		return nil, fmt.Errorf("cannot upload bootstrap tools: %v", err)
185
		return nil, fmt.Errorf("cannot upload bootstrap tools: %v", err)
760
181
	}
186
	}
761
182
187
762
=== modified file 'environs/config/config.go'
763
--- environs/config/config.go	2014-04-02 06:15:57 +0000
764
+++ environs/config/config.go	2014-04-03 17:37:27 +0000
765
@@ -7,6 +7,7 @@
766
7
	"fmt"
7
	"fmt"
767
8
	"io/ioutil"
8
	"io/ioutil"
768
9
	"os"
9
	"os"
769
10
	"os/exec"
770
10
	"path/filepath"
11
	"path/filepath"
771
11
	"regexp"
12
	"regexp"
772
12
	"strings"
13
	"strings"
773
@@ -34,9 +35,6 @@
774
34
	// port opened.
35
	// port opened.
775
35
	FwGlobal = "global"
36
	FwGlobal = "global"
776
36
37
777
37
	// DefaultSeries returns the most recent Ubuntu LTS release name.
778
38
	DefaultSeries string = "precise"
779
39
780
40
	// DefaultStatePort is the default port the state server is listening on.
38
	// DefaultStatePort is the default port the state server is listening on.
781
41
	DefaultStatePort int = 37017
39
	DefaultStatePort int = 37017
782
42
40
783
@@ -59,8 +57,53 @@
784
59
	// refreshing the addresses, in seconds. Not too frequent, as we
57
	// refreshing the addresses, in seconds. Not too frequent, as we
785
60
	// refresh addresses from the provider each time.
58
	// refresh addresses from the provider each time.
786
61
	DefaultBootstrapSSHAddressesDelay int = 10
59
	DefaultBootstrapSSHAddressesDelay int = 10
787
60
788
61
	// fallbackLtsSeries is the latest LTS series we'll use, if we fail to
789
62
	// obtain this information from the system.
790
63
	fallbackLtsSeries string = "precise"
791
62
)
64
)
792
63
65
793
66
var latestLtsSeries string
794
67
795
68
type HasDefaultSeries interface {
796
69
	DefaultSeries() (string, bool)
797
70
}
798
71
799
72
// PreferredSeries returns the preferred series to use when a charm does not
800
73
// explicitly specify a series.
801
74
func PreferredSeries(cfg HasDefaultSeries) string {
802
75
	if series, ok := cfg.DefaultSeries(); ok {
803
76
		return series
804
77
	}
805
78
	return LatestLtsSeries()
806
79
}
807
80
808
81
func LatestLtsSeries() string {
809
82
	if latestLtsSeries == "" {
810
83
		series, err := distroLtsSeries()
811
84
		if err != nil {
812
85
			latestLtsSeries = fallbackLtsSeries
813
86
		} else {
814
87
			latestLtsSeries = series
815
88
		}
816
89
	}
817
90
	return latestLtsSeries
818
91
}
819
92
820
93
// distroLtsSeries returns the latest LTS series, if this information is
821
94
// available on this system.
822
95
func distroLtsSeries() (string, error) {
823
96
	out, err := exec.Command("distro-info", "--lts").Output()
824
97
	if err != nil {
825
98
		return "", err
826
99
	}
827
100
	series := strings.TrimSpace(string(out))
828
101
	if !charm.IsValidSeries(series) {
829
102
		return "", fmt.Errorf("not a valid LTS series: %q", series)
830
103
	}
831
104
	return series, nil
832
105
}
833
106
834
64
// Config holds an immutable environment configuration.
107
// Config holds an immutable environment configuration.
835
65
type Config struct {
108
type Config struct {
836
66
	// defined holds the attributes that are defined for Config.
109
	// defined holds the attributes that are defined for Config.
837
@@ -162,7 +205,6 @@
838
162
	// For backward compatibility purposes, we treat as unset string
205
	// For backward compatibility purposes, we treat as unset string
839
163
	// valued attributes that are set to the empty string, and fill
206
	// valued attributes that are set to the empty string, and fill
840
164
	// out their defaults accordingly.
207
	// out their defaults accordingly.
841
165
	c.fillInStringDefault("default-series")
842
166
	c.fillInStringDefault("firewall-mode")
208
	c.fillInStringDefault("firewall-mode")
843
167
209
844
168
	// Load authorized-keys-path into authorized-keys if necessary.
210
	// Load authorized-keys-path into authorized-keys if necessary.
845
@@ -407,9 +449,17 @@
846
407
	return c.mustString("name")
449
	return c.mustString("name")
847
408
}
450
}
848
409
451
852
410
// DefaultSeries returns the default Ubuntu series for the environment.
452
// DefaultSeries returns the configured default Ubuntu series for the environment,
853
411
func (c *Config) DefaultSeries() string {
453
// and whether the default series was explicitly configured on the environment.
854
412
	return c.mustString("default-series")
454
func (c *Config) DefaultSeries() (string, bool) {
855
455
	if s, ok := c.defined["default-series"]; ok {
856
456
		if series, ok := s.(string); ok && series != "" {
857
457
			return series, true
858
458
		} else if !ok {
859
459
			logger.Warningf("invalid default-series: %q", s)
860
460
		}
861
461
	}
862
462
	return "", false
863
413
}
463
}
864
414
464
865
415
// StatePort returns the state server port for the environment.
465
// StatePort returns the state server port for the environment.
866
@@ -771,6 +821,8 @@
867
771
	"image-metadata-url": "", // TODO(rog) omit
821
	"image-metadata-url": "", // TODO(rog) omit
868
772
	"tools-metadata-url": "", // TODO(rog) omit
822
	"tools-metadata-url": "", // TODO(rog) omit
869
773
823
870
824
	"default-series": "",
871
825
872
774
	// For backward compatibility only - default ports were
826
	// For backward compatibility only - default ports were
873
775
	// not filled out in previous versions of the configuration.
827
	// not filled out in previous versions of the configuration.
874
776
	"state-port":  DefaultStatePort,
828
	"state-port":  DefaultStatePort,
875
@@ -795,7 +847,6 @@
876
795
// UseDefaults.
847
// UseDefaults.
877
796
func allDefaults() schema.Defaults {
848
func allDefaults() schema.Defaults {
878
797
	d := schema.Defaults{
849
	d := schema.Defaults{
879
798
		"default-series":            DefaultSeries,
880
799
		"firewall-mode":             FwInstance,
850
		"firewall-mode":             FwInstance,
881
800
		"development":               false,
851
		"development":               false,
882
801
		"ssl-hostname-verification": true,
852
		"ssl-hostname-verification": true,
883
802
853
884
=== modified file 'environs/config/config_test.go'
885
--- environs/config/config_test.go	2014-03-26 08:14:32 +0000
886
+++ environs/config/config_test.go	2014-04-03 17:37:27 +0000
887
@@ -652,7 +652,6 @@
888
652
	authTokenConfigTest("token=value, =z", false),
652
	authTokenConfigTest("token=value, =z", false),
889
653
	authTokenConfigTest("token=value =z", false),
653
	authTokenConfigTest("token=value =z", false),
890
654
	authTokenConfigTest("\t", false),
654
	authTokenConfigTest("\t", false),
891
655
	missingAttributeNoDefault("default-series"),
892
656
	missingAttributeNoDefault("firewall-mode"),
655
	missingAttributeNoDefault("firewall-mode"),
893
657
	missingAttributeNoDefault("development"),
656
	missingAttributeNoDefault("development"),
894
658
	missingAttributeNoDefault("ssl-hostname-verification"),
657
	missingAttributeNoDefault("ssl-hostname-verification"),
895
@@ -861,11 +860,14 @@
896
861
	testmode, _ := test.attrs["test-mode"].(bool)
860
	testmode, _ := test.attrs["test-mode"].(bool)
897
862
	c.Assert(cfg.TestMode(), gc.Equals, testmode)
861
	c.Assert(cfg.TestMode(), gc.Equals, testmode)
898
863
862
901
864
	if series, _ := test.attrs["default-series"].(string); series != "" {
863
	series, _ := test.attrs["default-series"].(string)
902
865
		c.Assert(cfg.DefaultSeries(), gc.Equals, series)
864
	if defaultSeries, ok := cfg.DefaultSeries(); ok {
903
865
		c.Assert(defaultSeries, gc.Equals, series)
904
866
	} else {
866
	} else {
906
867
		c.Assert(cfg.DefaultSeries(), gc.Equals, config.DefaultSeries)
867
		c.Assert(series, gc.Equals, "")
907
868
		c.Assert(defaultSeries, gc.Equals, "")
908
868
	}
869
	}
909
870
910
869
	if m, _ := test.attrs["firewall-mode"].(string); m != "" {
871
	if m, _ := test.attrs["firewall-mode"].(string); m != "" {
911
870
		c.Assert(cfg.FirewallMode(), gc.Equals, m)
872
		c.Assert(cfg.FirewallMode(), gc.Equals, m)
912
871
	}
873
	}
913
@@ -1010,7 +1012,7 @@
914
1010
		"bootstrap-timeout":         3600,
1012
		"bootstrap-timeout":         3600,
915
1011
		"bootstrap-retry-delay":     30,
1013
		"bootstrap-retry-delay":     30,
916
1012
		"bootstrap-addresses-delay": 10,
1014
		"bootstrap-addresses-delay": 10,
918
1013
		"default-series":            "precise",
1015
		"default-series":            testing.FakeDefaultSeries,
919
1014
		"charm-store-auth":          "token=auth",
1016
		"charm-store-auth":          "token=auth",
920
1015
		"test-mode":                 false,
1017
		"test-mode":                 false,
921
1016
	}
1018
	}
922
@@ -1019,7 +1021,6 @@
923
1019
1021
924
1020
	// These attributes are added if not set.
1022
	// These attributes are added if not set.
925
1021
	attrs["development"] = false
1023
	attrs["development"] = false
926
1022
	attrs["default-series"] = config.DefaultSeries
927
1023
	attrs["logging-config"] = "<root>=WARNING;unit=DEBUG"
1024
	attrs["logging-config"] = "<root>=WARNING;unit=DEBUG"
928
1024
	attrs["ca-private-key"] = ""
1025
	attrs["ca-private-key"] = ""
929
1025
	attrs["image-metadata-url"] = ""
1026
	attrs["image-metadata-url"] = ""
930
1026
1027
931
=== modified file 'environs/jujutest/livetests.go'
932
--- environs/jujutest/livetests.go	2014-04-03 02:57:11 +0000
933
+++ environs/jujutest/livetests.go	2014-04-03 17:37:27 +0000
934
@@ -133,7 +133,7 @@
935
133
	// we could connect to (actual live tests, rather than local-only)
133
	// we could connect to (actual live tests, rather than local-only)
936
134
	cons := constraints.MustParse("mem=2G")
134
	cons := constraints.MustParse("mem=2G")
937
135
	if t.CanOpenState {
135
	if t.CanOpenState {
939
136
		_, err := sync.Upload(t.Env.Storage(), nil, config.DefaultSeries)
136
		_, err := sync.Upload(t.Env.Storage(), nil, coretesting.FakeDefaultSeries)
940
137
		c.Assert(err, gc.IsNil)
137
		c.Assert(err, gc.IsNil)
941
138
	}
138
	}
942
139
	envtesting.UploadFakeTools(c, t.Env.Storage())
139
	envtesting.UploadFakeTools(c, t.Env.Storage())
943
@@ -442,7 +442,7 @@
944
442
442
945
443
	// If the series has not been specified, we expect the most recent Ubuntu LTS release to be used.
443
	// If the series has not been specified, we expect the most recent Ubuntu LTS release to be used.
946
444
	expectedVersion := version.Current
444
	expectedVersion := version.Current
948
445
	expectedVersion.Series = config.DefaultSeries
445
	expectedVersion.Series = config.LatestLtsSeries()
949
446
446
950
447
	mtools0 := waitAgentTools(c, mw0, expectedVersion)
447
	mtools0 := waitAgentTools(c, mw0, expectedVersion)
951
448
448
952
449
449
953
=== modified file 'environs/testing/tools.go'
954
--- environs/testing/tools.go	2014-03-27 00:42:27 +0000
955
+++ environs/testing/tools.go	2014-04-03 17:37:27 +0000
956
@@ -13,7 +13,6 @@
957
13
13
958
14
	agenttools "launchpad.net/juju-core/agent/tools"
14
	agenttools "launchpad.net/juju-core/agent/tools"
959
15
	"launchpad.net/juju-core/environs"
15
	"launchpad.net/juju-core/environs"
960
16
	"launchpad.net/juju-core/environs/config"
961
17
	"launchpad.net/juju-core/environs/simplestreams"
16
	"launchpad.net/juju-core/environs/simplestreams"
962
18
	"launchpad.net/juju-core/environs/storage"
17
	"launchpad.net/juju-core/environs/storage"
963
19
	envtools "launchpad.net/juju-core/environs/tools"
18
	envtools "launchpad.net/juju-core/environs/tools"
964
@@ -163,8 +162,9 @@
965
163
func uploadFakeTools(stor storage.Storage) error {
162
func uploadFakeTools(stor storage.Storage) error {
966
164
	versions := []version.Binary{version.Current}
163
	versions := []version.Binary{version.Current}
967
165
	toolsVersion := version.Current
164
	toolsVersion := version.Current
970
166
	if toolsVersion.Series != config.DefaultSeries {
165
	latestLts := coretesting.FakeDefaultSeries
971
167
		toolsVersion.Series = config.DefaultSeries
166
	if toolsVersion.Series != latestLts {
972
167
		toolsVersion.Series = latestLts
973
168
		versions = append(versions, toolsVersion)
168
		versions = append(versions, toolsVersion)
974
169
	}
169
	}
975
170
	if _, err := UploadFakeToolsVersions(stor, versions...); err != nil {
170
	if _, err := UploadFakeToolsVersions(stor, versions...); err != nil {
976
@@ -175,9 +175,9 @@
977
175
175
978
176
// UploadFakeTools puts fake tools into the supplied storage with a binary
176
// UploadFakeTools puts fake tools into the supplied storage with a binary
979
177
// version matching version.Current; if version.Current's series is different
177
// version matching version.Current; if version.Current's series is different
983
178
// to config.DefaultSeries, matching fake tools will be uploaded for that series.
178
// to coretesting.FakeDefaultSeries, matching fake tools will be uploaded for that
984
179
// This is useful for tests that are kinda casual about specifying their
179
// series.  This is useful for tests that are kinda casual about specifying
985
180
// environment.
180
// their environment.
986
181
func UploadFakeTools(c *gc.C, stor storage.Storage) {
181
func UploadFakeTools(c *gc.C, stor storage.Storage) {
987
182
	c.Assert(uploadFakeTools(stor), gc.IsNil)
182
	c.Assert(uploadFakeTools(stor), gc.IsNil)
988
183
}
183
}
989
@@ -196,8 +196,9 @@
990
196
	name := envtools.StorageName(toolsVersion)
196
	name := envtools.StorageName(toolsVersion)
991
197
	err := stor.Remove(name)
197
	err := stor.Remove(name)
992
198
	c.Check(err, gc.IsNil)
198
	c.Check(err, gc.IsNil)
995
199
	if version.Current.Series != config.DefaultSeries {
199
	defaultSeries := coretesting.FakeDefaultSeries
996
200
		toolsVersion.Series = config.DefaultSeries
200
	if version.Current.Series != defaultSeries {
997
201
		toolsVersion.Series = defaultSeries
998
201
		name := envtools.StorageName(toolsVersion)
202
		name := envtools.StorageName(toolsVersion)
999
202
		err := stor.Remove(name)
203
		err := stor.Remove(name)
1000
203
		c.Check(err, gc.IsNil)
204
		c.Check(err, gc.IsNil)
1001
204
205
1002
=== modified file 'juju/apiconn_test.go'
1003
--- juju/apiconn_test.go	2014-04-02 00:18:34 +0000
1004
+++ juju/apiconn_test.go	2014-04-03 17:37:27 +0000
1005
@@ -175,7 +175,7 @@
1006
175
			"name":                      "myenv",
175
			"name":                      "myenv",
1007
176
			"state-server":              true,
176
			"state-server":              true,
1008
177
			"authorized-keys":           "i-am-a-key",
177
			"authorized-keys":           "i-am-a-key",
1010
178
			"default-series":            config.DefaultSeries,
178
			"default-series":            config.LatestLtsSeries(),
1011
179
			"firewall-mode":             config.FwInstance,
179
			"firewall-mode":             config.FwInstance,
1012
180
			"development":               false,
180
			"development":               false,
1013
181
			"ssl-hostname-verification": true,
181
			"ssl-hostname-verification": true,
1014
182
182
1015
=== modified file 'juju/testing/conn.go'
1016
--- juju/testing/conn.go	2014-03-25 15:06:31 +0000
1017
+++ juju/testing/conn.go	2014-04-03 17:37:27 +0000
1018
@@ -17,6 +17,7 @@
1019
17
	"launchpad.net/juju-core/constraints"
17
	"launchpad.net/juju-core/constraints"
1020
18
	"launchpad.net/juju-core/environs"
18
	"launchpad.net/juju-core/environs"
1021
19
	"launchpad.net/juju-core/environs/bootstrap"
19
	"launchpad.net/juju-core/environs/bootstrap"
1022
20
	"launchpad.net/juju-core/environs/config"
1023
20
	"launchpad.net/juju-core/environs/configstore"
21
	"launchpad.net/juju-core/environs/configstore"
1024
21
	envtesting "launchpad.net/juju-core/environs/testing"
22
	envtesting "launchpad.net/juju-core/environs/testing"
1025
22
	"launchpad.net/juju-core/juju"
23
	"launchpad.net/juju-core/juju"
1026
@@ -164,6 +165,14 @@
1027
164
	return s.openAPIAs(c, machine.Tag(), password, "fake_nonce"), machine
165
	return s.openAPIAs(c, machine.Tag(), password, "fake_nonce"), machine
1028
165
}
166
}
1029
166
167
1030
168
func PreferredDefaultVersions(conf *config.Config, template version.Binary) []version.Binary {
1031
169
	prefVersion := template
1032
170
	prefVersion.Series = config.PreferredSeries(conf)
1033
171
	defaultVersion := template
1034
172
	defaultVersion.Series = testing.FakeDefaultSeries
1035
173
	return []version.Binary{prefVersion, defaultVersion}
1036
174
}
1037
175
1038
167
func (s *JujuConnSuite) setUpConn(c *gc.C) {
176
func (s *JujuConnSuite) setUpConn(c *gc.C) {
1039
168
	if s.RootDir != "" {
177
	if s.RootDir != "" {
1040
169
		panic("JujuConnSuite.setUpConn without teardown")
178
		panic("JujuConnSuite.setUpConn without teardown")
1041
@@ -203,7 +212,11 @@
1042
203
	c.Assert(environ.Name(), gc.Equals, "dummyenv")
212
	c.Assert(environ.Name(), gc.Equals, "dummyenv")
1043
204
	s.PatchValue(&dummy.DataDir, s.DataDir())
213
	s.PatchValue(&dummy.DataDir, s.DataDir())
1044
205
214
1046
206
	envtesting.MustUploadFakeTools(environ.Storage())
215
	versions := PreferredDefaultVersions(environ.Config(), version.Current)
1047
216
	versions = append(versions, version.Current)
1048
217
1049
218
	// Upload tools for both preferred and fake default series
1050
219
	envtesting.MustUploadFakeToolsVersions(environ.Storage(), versions...)
1051
207
	c.Assert(bootstrap.Bootstrap(ctx, environ, constraints.Value{}), gc.IsNil)
220
	c.Assert(bootstrap.Bootstrap(ctx, environ, constraints.Value{}), gc.IsNil)
1052
208
221
1053
209
	s.BackingState = environ.(GetStater).GetStateInAPIServer()
222
	s.BackingState = environ.(GetStater).GetStateInAPIServer()
1054
@@ -285,7 +298,7 @@
1055
285
	ch := testing.Charms.Dir(name)
298
	ch := testing.Charms.Dir(name)
1056
286
	ident := fmt.Sprintf("%s-%d", ch.Meta().Name, ch.Revision())
299
	ident := fmt.Sprintf("%s-%d", ch.Meta().Name, ch.Revision())
1057
287
	curl := charm.MustParseURL("local:quantal/" + ident)
300
	curl := charm.MustParseURL("local:quantal/" + ident)
1059
288
	repo, err := charm.InferRepository(curl, testing.Charms.Path())
301
	repo, err := charm.InferRepository(curl.Reference, testing.Charms.Path())
1060
289
	c.Assert(err, gc.IsNil)
302
	c.Assert(err, gc.IsNil)
1061
290
	sch, err := s.Conn.PutCharm(curl, repo, false)
303
	sch, err := s.Conn.PutCharm(curl, repo, false)
1062
291
	c.Assert(err, gc.IsNil)
304
	c.Assert(err, gc.IsNil)
1063
292
305
1064
=== modified file 'juju/testing/instance.go'
1065
--- juju/testing/instance.go	2014-04-01 16:27:22 +0000
1066
+++ juju/testing/instance.go	2014-04-03 17:37:27 +0000
1067
@@ -10,6 +10,7 @@
1068
10
10
1069
11
	"launchpad.net/juju-core/constraints"
11
	"launchpad.net/juju-core/constraints"
1070
12
	"launchpad.net/juju-core/environs"
12
	"launchpad.net/juju-core/environs"
1071
13
	"launchpad.net/juju-core/environs/config"
1072
13
	"launchpad.net/juju-core/environs/tools"
14
	"launchpad.net/juju-core/environs/tools"
1073
14
	"launchpad.net/juju-core/instance"
15
	"launchpad.net/juju-core/instance"
1074
15
	"launchpad.net/juju-core/names"
16
	"launchpad.net/juju-core/names"
1075
@@ -112,7 +113,7 @@
1076
112
) (
113
) (
1077
113
	instance.Instance, *instance.HardwareCharacteristics, error,
114
	instance.Instance, *instance.HardwareCharacteristics, error,
1078
114
) {
115
) {
1080
115
	series := env.Config().DefaultSeries()
116
	series := config.PreferredSeries(env.Config())
1081
116
	agentVersion, ok := env.Config().AgentVersion()
117
	agentVersion, ok := env.Config().AgentVersion()
1082
117
	if !ok {
118
	if !ok {
1083
118
		return nil, nil, fmt.Errorf("missing agent version in environment config")
119
		return nil, nil, fmt.Errorf("missing agent version in environment config")
1084
119
120
1085
=== modified file 'provider/azure/environ_test.go'
1086
--- provider/azure/environ_test.go	2014-04-03 09:07:57 +0000
1087
+++ provider/azure/environ_test.go	2014-04-03 17:37:27 +0000
1088
@@ -448,7 +448,7 @@
1089
448
	err = env.SetConfig(cfg)
448
	err = env.SetConfig(cfg)
1090
449
	c.Assert(err, gc.IsNil)
449
	c.Assert(err, gc.IsNil)
1091
450
450
1093
451
	c.Check(env.ecfg.Config.DefaultSeries(), gc.Equals, "feisty")
451
	c.Check(config.PreferredSeries(env.ecfg.Config), gc.Equals, "feisty")
1094
452
}
452
}
1095
453
453
1096
454
func (*environSuite) TestSetConfigLocksEnviron(c *gc.C) {
454
func (*environSuite) TestSetConfigLocksEnviron(c *gc.C) {
1097
455
455
1098
=== modified file 'provider/common/bootstrap.go'
1099
--- provider/common/bootstrap.go	2014-03-28 22:31:08 +0000
1100
+++ provider/common/bootstrap.go	2014-04-03 17:37:27 +0000
1101
@@ -42,7 +42,7 @@
1102
42
	defer func() { handleBootstrapError(err, ctx, inst, env) }()
42
	defer func() { handleBootstrapError(err, ctx, inst, env) }()
1103
43
43
1104
44
	// First thing, ensure we have tools otherwise there's no point.
44
	// First thing, ensure we have tools otherwise there's no point.
1106
45
	selectedTools, err := EnsureBootstrapTools(ctx, env, env.Config().DefaultSeries(), cons.Arch)
45
	selectedTools, err := EnsureBootstrapTools(ctx, env, config.PreferredSeries(env.Config()), cons.Arch)
1107
46
	if err != nil {
46
	if err != nil {
1108
47
		return err
47
		return err
1109
48
	}
48
	}
1110
49
49
1111
=== modified file 'provider/dummy/environs.go'
1112
--- provider/dummy/environs.go	2014-04-03 03:37:45 +0000
1113
+++ provider/dummy/environs.go	2014-04-03 17:37:27 +0000
1114
@@ -545,7 +545,7 @@
1115
545
}
545
}
1116
546
546
1117
547
func (e *environ) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
547
func (e *environ) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
1119
548
	selectedTools, err := common.EnsureBootstrapTools(ctx, e, e.Config().DefaultSeries(), cons.Arch)
548
	selectedTools, err := common.EnsureBootstrapTools(ctx, e, config.PreferredSeries(e.Config()), cons.Arch)
1120
549
	if err != nil {
549
	if err != nil {
1121
550
		return err
550
		return err
1122
551
	}
551
	}
1123
552
552
1124
=== modified file 'provider/ec2/ec2.go'
1125
--- provider/ec2/ec2.go	2014-04-03 03:37:45 +0000
1126
+++ provider/ec2/ec2.go	2014-04-03 17:37:27 +0000
1127
@@ -367,7 +367,7 @@
1128
367
		return nil, err
367
		return nil, err
1129
368
	}
368
	}
1130
369
	return &simplestreams.MetadataLookupParams{
369
	return &simplestreams.MetadataLookupParams{
1132
370
		Series:        e.ecfg().DefaultSeries(),
370
		Series:        config.PreferredSeries(e.ecfg()),
1133
371
		Region:        cloudSpec.Region,
371
		Region:        cloudSpec.Region,
1134
372
		Endpoint:      cloudSpec.Endpoint,
372
		Endpoint:      cloudSpec.Endpoint,
1135
373
		Architectures: arch.AllSupportedArches,
373
		Architectures: arch.AllSupportedArches,
1136
374
374
1137
=== modified file 'provider/ec2/live_test.go'
1138
--- provider/ec2/live_test.go	2014-03-20 03:06:57 +0000
1139
+++ provider/ec2/live_test.go	2014-04-03 17:37:27 +0000
1140
@@ -101,7 +101,7 @@
1141
101
	t.LiveTests.SetUpTest(c)
101
	t.LiveTests.SetUpTest(c)
1142
102
	t.PatchValue(&version.Current, version.Binary{
102
	t.PatchValue(&version.Current, version.Binary{
1143
103
		Number: version.Current.Number,
103
		Number: version.Current.Number,
1145
104
		Series: config.DefaultSeries,
104
		Series: coretesting.FakeDefaultSeries,
1146
105
		Arch:   arch.AMD64,
105
		Arch:   arch.AMD64,
1147
106
	})
106
	})
1148
107
107
1149
108
108
1150
=== modified file 'provider/ec2/local_test.go'
1151
--- provider/ec2/local_test.go	2014-04-02 11:35:49 +0000
1152
+++ provider/ec2/local_test.go	2014-04-03 17:37:27 +0000
1153
@@ -205,7 +205,7 @@
1154
205
	t.Tests.SetUpTest(c)
205
	t.Tests.SetUpTest(c)
1155
206
	t.PatchValue(&version.Current, version.Binary{
206
	t.PatchValue(&version.Current, version.Binary{
1156
207
		Number: version.Current.Number,
207
		Number: version.Current.Number,
1158
208
		Series: config.DefaultSeries,
208
		Series: coretesting.FakeDefaultSeries,
1159
209
		Arch:   arch.AMD64,
209
		Arch:   arch.AMD64,
1160
210
	})
210
	})
1161
211
}
211
}
1162
212
212
1163
=== modified file 'provider/joyent/environ.go'
1164
--- provider/joyent/environ.go	2014-04-03 03:37:45 +0000
1165
+++ provider/joyent/environ.go	2014-04-03 17:37:27 +0000
1166
@@ -154,7 +154,7 @@
1167
154
		region = env.Ecfg().Region()
154
		region = env.Ecfg().Region()
1168
155
	}
155
	}
1169
156
	return &simplestreams.MetadataLookupParams{
156
	return &simplestreams.MetadataLookupParams{
1171
157
		Series:        env.Ecfg().DefaultSeries(),
157
		Series:        config.PreferredSeries(env.Ecfg()),
1172
158
		Region:        region,
158
		Region:        region,
1173
159
		Endpoint:      env.Ecfg().sdcUrl(),
159
		Endpoint:      env.Ecfg().sdcUrl(),
1174
160
		Architectures: []string{"amd64", "arm"},
160
		Architectures: []string{"amd64", "arm"},
1175
161
161
1176
=== modified file 'provider/openstack/provider.go'
1177
--- provider/openstack/provider.go	2014-04-03 03:37:45 +0000
1178
+++ provider/openstack/provider.go	2014-04-03 17:37:27 +0000
1179
@@ -1236,7 +1236,7 @@
1180
1236
		return nil, err
1236
		return nil, err
1181
1237
	}
1237
	}
1182
1238
	return &simplestreams.MetadataLookupParams{
1238
	return &simplestreams.MetadataLookupParams{
1184
1239
		Series:        e.ecfg().DefaultSeries(),
1239
		Series:        config.PreferredSeries(e.ecfg()),
1185
1240
		Region:        cloudSpec.Region,
1240
		Region:        cloudSpec.Region,
1186
1241
		Endpoint:      cloudSpec.Endpoint,
1241
		Endpoint:      cloudSpec.Endpoint,
1187
1242
		Architectures: arch.AllSupportedArches,
1242
		Architectures: arch.AllSupportedArches,
1188
1243
1243
1189
=== modified file 'state/api/client.go'
1190
--- state/api/client.go	2014-03-28 13:31:26 +0000
1191
+++ state/api/client.go	2014-04-03 17:37:27 +0000
1192
@@ -608,6 +608,24 @@
1193
608
	return c.call("AddCharm", args, nil)
608
	return c.call("AddCharm", args, nil)
1194
609
}
609
}
1195
610
610
1196
611
// ResolveCharms resolves the best available charm URLs with series, for charm
1197
612
// locations without a series specified.
1198
613
func (c *Client) ResolveCharm(ref charm.Reference) (*charm.URL, error) {
1199
614
	args := params.ResolveCharms{References: []charm.Reference{ref}}
1200
615
	result := new(params.ResolveCharmResults)
1201
616
	if err := c.st.Call("Client", "", "ResolveCharms", args, result); err != nil {
1202
617
		return nil, err
1203
618
	}
1204
619
	if len(result.URLs) == 0 {
1205
620
		return nil, fmt.Errorf("unexpected empty response")
1206
621
	}
1207
622
	urlInfo := result.URLs[0]
1208
623
	if urlInfo.Error != "" {
1209
624
		return nil, fmt.Errorf("%v", urlInfo.Error)
1210
625
	}
1211
626
	return urlInfo.URL, nil
1212
627
}
1213
628
1214
611
func (c *Client) UploadTools(
629
func (c *Client) UploadTools(
1215
612
	toolsFilename string, vers version.Binary, fakeSeries ...string,
630
	toolsFilename string, vers version.Binary, fakeSeries ...string,
1216
613
) (
631
) (
1217
614
632
1218
=== modified file 'state/api/params/params.go'
1219
--- state/api/params/params.go	2014-04-03 02:57:11 +0000
1220
+++ state/api/params/params.go	2014-04-03 17:37:27 +0000
1221
@@ -330,6 +330,22 @@
1222
330
	CharmURL string
330
	CharmURL string
1223
331
}
331
}
1224
332
332
1225
333
// ResolveCharms stores charm references for a ResolveCharms call.
1226
334
type ResolveCharms struct {
1227
335
	References []charm.Reference
1228
336
}
1229
337
1230
338
// ResolveCharmResult holds the result of resolving a charm reference to a URL, or any error that occurred.
1231
339
type ResolveCharmResult struct {
1232
340
	URL   *charm.URL `json:",omitempty"`
1233
341
	Error string     `json:",omitempty"`
1234
342
}
1235
343
1236
344
// ResolveCharmResults holds results of the ResolveCharms call.
1237
345
type ResolveCharmResults struct {
1238
346
	URLs []ResolveCharmResult
1239
347
}
1240
348
1241
333
// AllWatcherId holds the id of an AllWatcher.
349
// AllWatcherId holds the id of an AllWatcher.
1242
334
type AllWatcherId struct {
350
type AllWatcherId struct {
1243
335
	AllWatcherId string
351
	AllWatcherId string
1244
336
352
1245
=== modified file 'state/apiserver/client/client.go'
1246
--- state/apiserver/client/client.go	2014-03-28 13:31:26 +0000
1247
+++ state/apiserver/client/client.go	2014-04-03 17:37:27 +0000
1248
@@ -567,16 +567,8 @@
1249
567
	results := params.AddMachinesResults{
567
	results := params.AddMachinesResults{
1250
568
		Machines: make([]params.AddMachinesResult, len(args.MachineParams)),
568
		Machines: make([]params.AddMachinesResult, len(args.MachineParams)),
1251
569
	}
569
	}
1252
570
1253
571
	var defaultSeries string
1254
572
	conf, err := c.api.state.EnvironConfig()
1255
573
	if err != nil {
1256
574
		return results, err
1257
575
	}
1258
576
	defaultSeries = conf.DefaultSeries()
1259
577
1260
578
	for i, p := range args.MachineParams {
570
	for i, p := range args.MachineParams {
1262
579
		m, err := c.addOneMachine(p, defaultSeries)
571
		m, err := c.addOneMachine(p)
1263
580
		results.Machines[i].Error = common.ServerError(err)
572
		results.Machines[i].Error = common.ServerError(err)
1264
581
		if err == nil {
573
		if err == nil {
1265
582
			results.Machines[i].Machine = m.Id()
574
			results.Machines[i].Machine = m.Id()
1266
@@ -590,9 +582,13 @@
1267
590
	return c.AddMachines(args)
582
	return c.AddMachines(args)
1268
591
}
583
}
1269
592
584
1271
593
func (c *Client) addOneMachine(p params.AddMachineParams, defaultSeries string) (*state.Machine, error) {
585
func (c *Client) addOneMachine(p params.AddMachineParams) (*state.Machine, error) {
1272
594
	if p.Series == "" {
586
	if p.Series == "" {
1274
595
		p.Series = defaultSeries
587
		conf, err := c.api.state.EnvironConfig()
1275
588
		if err != nil {
1276
589
			return nil, err
1277
590
		}
1278
591
		p.Series = config.PreferredSeries(conf)
1279
596
	}
592
	}
1280
597
	if p.ContainerType != "" {
593
	if p.ContainerType != "" {
1281
598
		// Guard against dubious client by making sure that
594
		// Guard against dubious client by making sure that
1282
@@ -709,7 +705,7 @@
1283
709
	}
705
	}
1284
710
706
1285
711
	info := api.EnvironmentInfo{
707
	info := api.EnvironmentInfo{
1287
712
		DefaultSeries: conf.DefaultSeries(),
708
		DefaultSeries: config.PreferredSeries(conf),
1288
713
		ProviderType:  conf.Type(),
709
		ProviderType:  conf.Type(),
1289
714
		Name:          conf.Name(),
710
		Name:          conf.Name(),
1290
715
		UUID:          env.UUID(),
711
		UUID:          env.UUID(),
1291
@@ -955,6 +951,37 @@
1292
955
	return err
951
	return err
1293
956
}
952
}
1294
957
953
1295
954
func (c *Client) ResolveCharms(args params.ResolveCharms) (params.ResolveCharmResults, error) {
1296
955
	var results params.ResolveCharmResults
1297
956
1298
957
	envConfig, err := c.api.state.EnvironConfig()
1299
958
	if err != nil {
1300
959
		return params.ResolveCharmResults{}, err
1301
960
	}
1302
961
	repo := config.SpecializeCharmRepo(CharmStore, envConfig)
1303
962
1304
963
	for _, ref := range args.References {
1305
964
		result := params.ResolveCharmResult{}
1306
965
		curl, err := c.resolveCharm(ref, repo)
1307
966
		if err != nil {
1308
967
			result.Error = err.Error()
1309
968
		} else {
1310
969
			result.URL = curl
1311
970
		}
1312
971
		results.URLs = append(results.URLs, result)
1313
972
	}
1314
973
	return results, nil
1315
974
}
1316
975
1317
976
func (c *Client) resolveCharm(ref charm.Reference, repo charm.Repository) (*charm.URL, error) {
1318
977
	if ref.Schema != "cs" {
1319
978
		return nil, fmt.Errorf("only charm store charm references are supported, with cs: schema")
1320
979
	}
1321
980
1322
981
	// Resolve the charm location with the repository.
1323
982
	return repo.Resolve(ref)
1324
983
}
1325
984
1326
958
// CharmArchiveName returns a string that is suitable as a file name
985
// CharmArchiveName returns a string that is suitable as a file name
1327
959
// in a storage URL. It is constructed from the charm name, revision
986
// in a storage URL. It is constructed from the charm name, revision
1328
960
// and a random UUID string.
987
// and a random UUID string.
1329
@@ -993,7 +1020,7 @@
1330
993
		if err != nil {
1020
		if err != nil {
1331
994
			return err
1021
			return err
1332
995
		}
1022
		}
1334
996
		series = cfg.DefaultSeries()
1023
		series = config.PreferredSeries(cfg)
1335
997
	}
1024
	}
1336
998
	return c.api.state.EnsureAvailability(args.NumStateServers, args.Constraints, series)
1025
	return c.api.state.EnsureAvailability(args.NumStateServers, args.Constraints, series)
1337
999
}
1026
}
1338
1000
1027
1339
=== modified file 'state/apiserver/client/client_test.go'
1340
--- state/apiserver/client/client_test.go	2014-04-01 03:37:13 +0000
1341
+++ state/apiserver/client/client_test.go	2014-04-03 17:37:27 +0000
1342
@@ -261,7 +261,7 @@
1343
261
	c.Assert(err, gc.IsNil)
261
	c.Assert(err, gc.IsNil)
1344
262
	env, err := s.State.Environment()
262
	env, err := s.State.Environment()
1345
263
	c.Assert(err, gc.IsNil)
263
	c.Assert(err, gc.IsNil)
1347
264
	c.Assert(info.DefaultSeries, gc.Equals, conf.DefaultSeries())
264
	c.Assert(info.DefaultSeries, gc.Equals, config.PreferredSeries(conf))
1348
265
	c.Assert(info.ProviderType, gc.Equals, conf.Type())
265
	c.Assert(info.ProviderType, gc.Equals, conf.Type())
1349
266
	c.Assert(info.Name, gc.Equals, conf.Name())
266
	c.Assert(info.Name, gc.Equals, conf.Name())
1350
267
	c.Assert(info.UUID, gc.Equals, env.UUID())
267
	c.Assert(info.UUID, gc.Equals, env.UUID())
1351
@@ -1119,8 +1119,12 @@
1352
1119
}
1119
}
1353
1120
1120
1354
1121
func addCharm(c *gc.C, store *coretesting.MockCharmStore, name string) (*charm.URL, charm.Charm) {
1121
func addCharm(c *gc.C, store *coretesting.MockCharmStore, name string) (*charm.URL, charm.Charm) {
1355
1122
	return addSeriesCharm(c, store, "precise", name)
1356
1123
}
1357
1124
1358
1125
func addSeriesCharm(c *gc.C, store *coretesting.MockCharmStore, series, name string) (*charm.URL, charm.Charm) {
1359
1122
	bundle := coretesting.Charms.Bundle(c.MkDir(), name)
1126
	bundle := coretesting.Charms.Bundle(c.MkDir(), name)
1361
1123
	scurl := fmt.Sprintf("cs:precise/%s-%d", name, bundle.Revision())
1127
	scurl := fmt.Sprintf("cs:%s/%s-%d", series, name, bundle.Revision())
1362
1124
	curl := charm.MustParseURL(scurl)
1128
	curl := charm.MustParseURL(scurl)
1363
1125
	err := store.SetCharm(curl, bundle)
1129
	err := store.SetCharm(curl, bundle)
1364
1126
	c.Assert(err, gc.IsNil)
1130
	c.Assert(err, gc.IsNil)
1365
@@ -1634,7 +1638,7 @@
1366
1634
	c.Assert(len(machines), gc.Equals, 3)
1638
	c.Assert(len(machines), gc.Equals, 3)
1367
1635
	for i, machineResult := range machines {
1639
	for i, machineResult := range machines {
1368
1636
		c.Assert(machineResult.Machine, gc.DeepEquals, strconv.Itoa(i))
1640
		c.Assert(machineResult.Machine, gc.DeepEquals, strconv.Itoa(i))
1370
1637
		s.checkMachine(c, machineResult.Machine, config.DefaultSeries, apiParams[i].Constraints.String())
1641
		s.checkMachine(c, machineResult.Machine, coretesting.FakeDefaultSeries, apiParams[i].Constraints.String())
1371
1638
	}
1642
	}
1372
1639
}
1643
}
1373
1640
1644
1374
@@ -1684,7 +1688,7 @@
1375
1684
	c.Assert(len(machines), gc.Equals, 3)
1688
	c.Assert(len(machines), gc.Equals, 3)
1376
1685
	for i, machineResult := range machines {
1689
	for i, machineResult := range machines {
1377
1686
		c.Assert(machineResult.Machine, gc.DeepEquals, strconv.Itoa(i))
1690
		c.Assert(machineResult.Machine, gc.DeepEquals, strconv.Itoa(i))
1379
1687
		s.checkMachine(c, machineResult.Machine, config.DefaultSeries, apiParams[i].Constraints.String())
1691
		s.checkMachine(c, machineResult.Machine, coretesting.FakeDefaultSeries, apiParams[i].Constraints.String())
1380
1688
	}
1692
	}
1381
1689
}
1693
}
1382
1690
1694
1383
@@ -1755,7 +1759,7 @@
1384
1755
			c.Assert(machineResult.Error, gc.ErrorMatches, "cannot add a new machine: cannot add a machine with an instance id and no nonce")
1759
			c.Assert(machineResult.Error, gc.ErrorMatches, "cannot add a new machine: cannot add a machine with an instance id and no nonce")
1385
1756
		} else {
1760
		} else {
1386
1757
			c.Assert(machineResult.Machine, gc.DeepEquals, strconv.Itoa(i))
1761
			c.Assert(machineResult.Machine, gc.DeepEquals, strconv.Itoa(i))
1388
1758
			s.checkMachine(c, machineResult.Machine, config.DefaultSeries, apiParams[i].Constraints.String())
1762
			s.checkMachine(c, machineResult.Machine, coretesting.FakeDefaultSeries, apiParams[i].Constraints.String())
1389
1759
			instanceId := fmt.Sprintf("1234-%d", i)
1763
			instanceId := fmt.Sprintf("1234-%d", i)
1390
1760
			s.checkInstance(c, machineResult.Machine, instanceId, "foo", hc, addrs)
1764
			s.checkInstance(c, machineResult.Machine, instanceId, "foo", hc, addrs)
1391
1761
		}
1765
		}
1392
@@ -1943,6 +1947,57 @@
1393
1943
	s.assertUploaded(c, storage, sch.BundleURL(), sch.BundleSha256())
1947
	s.assertUploaded(c, storage, sch.BundleURL(), sch.BundleSha256())
1394
1944
}
1948
}
1395
1945
1949
1396
1950
var resolveCharmCases = []struct {
1397
1951
	schema, defaultSeries, charmName string
1398
1952
	parseErr                         string
1399
1953
	resolveErr                       string
1400
1954
}{
1401
1955
	{"cs", "precise", "wordpress", "", ""},
1402
1956
	{"cs", "trusty", "wordpress", "", ""},
1403
1957
	{"cs", "", "wordpress", "", `missing default series, cannot resolve charm url: "cs:wordpress"`},
1404
1958
	{"cs", "trusty", "", `charm URL has invalid charm name: "cs:"`, ""},
1405
1959
	{"local", "trusty", "wordpress", "", `only charm store charm references are supported, with cs: schema`},
1406
1960
	{"cs", "precise", "hl3", "", ""},
1407
1961
	{"cs", "trusty", "hl3", "", ""},
1408
1962
	{"cs", "", "hl3", "", `missing default series, cannot resolve charm url: \"cs:hl3\"`},
1409
1963
}
1410
1964
1411
1965
func (s *clientSuite) TestResolveCharm(c *gc.C) {
1412
1966
	store, restore := makeMockCharmStore()
1413
1967
	defer restore()
1414
1968
1415
1969
	for i, test := range resolveCharmCases {
1416
1970
		c.Logf("test %d: %#v", i, test)
1417
1971
		// Mock charm store will use this to resolve a charm reference.
1418
1972
		store.DefaultSeries = test.defaultSeries
1419
1973
1420
1974
		client := s.APIState.Client()
1421
1975
		ref, series, err := charm.ParseReference(fmt.Sprintf("%s:%s", test.schema, test.charmName))
1422
1976
		if test.parseErr == "" {
1423
1977
			if !c.Check(err, gc.IsNil) {
1424
1978
				continue
1425
1979
			}
1426
1980
		} else {
1427
1981
			c.Assert(err, gc.NotNil)
1428
1982
			c.Check(err, gc.ErrorMatches, test.parseErr)
1429
1983
			continue
1430
1984
		}
1431
1985
		c.Check(series, gc.Equals, "")
1432
1986
		c.Check(ref.String(), gc.Equals, fmt.Sprintf("%s:%s", test.schema, test.charmName))
1433
1987
1434
1988
		curl, err := client.ResolveCharm(ref)
1435
1989
		if err == nil {
1436
1990
			c.Assert(curl, gc.NotNil)
1437
1991
			// Only cs: schema should make it through here
1438
1992
			c.Check(curl.String(), gc.Equals, fmt.Sprintf("cs:%s/%s", test.defaultSeries, test.charmName))
1439
1993
			c.Check(test.resolveErr, gc.Equals, "")
1440
1994
		} else {
1441
1995
			c.Check(curl, gc.IsNil)
1442
1996
			c.Check(err, gc.ErrorMatches, test.resolveErr)
1443
1997
		}
1444
1998
	}
1445
1999
}
1446
2000
1447
1946
func (s *clientSuite) TestAddCharmConcurrently(c *gc.C) {
2001
func (s *clientSuite) TestAddCharmConcurrently(c *gc.C) {
1448
1947
	store, restore := makeMockCharmStore()
2002
	store, restore := makeMockCharmStore()
1449
1948
	defer restore()
2003
	defer restore()
1450
1949
2004
1451
=== modified file 'testing/environ.go'
1452
--- testing/environ.go	2014-04-01 08:20:44 +0000
1453
+++ testing/environ.go	2014-04-03 17:37:27 +0000
1454
@@ -28,6 +28,8 @@
1455
28
	}
28
	}
1456
29
}
29
}
1457
30
30
1458
31
const FakeDefaultSeries = "precise"
1459
32
1460
31
// FakeConfig() returns an environment configuration for a
33
// FakeConfig() returns an environment configuration for a
1461
32
// fake provider with all required attributes set.
34
// fake provider with all required attributes set.
1462
33
func FakeConfig() Attrs {
35
func FakeConfig() Attrs {
1463
@@ -43,7 +45,7 @@
1464
43
		"development":               false,
45
		"development":               false,
1465
44
		"state-port":                19034,
46
		"state-port":                19034,
1466
45
		"api-port":                  17777,
47
		"api-port":                  17777,
1468
46
		"default-series":            config.DefaultSeries,
48
		"default-series":            FakeDefaultSeries,
1469
47
	}
49
	}
1470
48
}
50
}
1471
49
51
1472
50
52
1473
=== modified file 'worker/provisioner/container_initialisation_test.go'
1474
--- worker/provisioner/container_initialisation_test.go	2014-03-19 03:48:12 +0000
1475
+++ worker/provisioner/container_initialisation_test.go	2014-04-03 17:37:27 +0000
1476
@@ -12,10 +12,10 @@
1477
12
12
1478
13
	"launchpad.net/juju-core/agent"
13
	"launchpad.net/juju-core/agent"
1479
14
	"launchpad.net/juju-core/environs"
14
	"launchpad.net/juju-core/environs"
1480
15
	"launchpad.net/juju-core/environs/config"
1481
16
	"launchpad.net/juju-core/instance"
15
	"launchpad.net/juju-core/instance"
1482
17
	"launchpad.net/juju-core/state"
16
	"launchpad.net/juju-core/state"
1483
18
	apiprovisioner "launchpad.net/juju-core/state/api/provisioner"
17
	apiprovisioner "launchpad.net/juju-core/state/api/provisioner"
1484
18
	coretesting "launchpad.net/juju-core/testing"
1485
19
	"launchpad.net/juju-core/utils"
19
	"launchpad.net/juju-core/utils"
1486
20
	"launchpad.net/juju-core/version"
20
	"launchpad.net/juju-core/version"
1487
21
	"launchpad.net/juju-core/worker"
21
	"launchpad.net/juju-core/worker"
1488
@@ -88,7 +88,7 @@
1489
88
88
1490
89
	// make a container on the host machine
89
	// make a container on the host machine
1491
90
	template := state.MachineTemplate{
90
	template := state.MachineTemplate{
1493
91
		Series: config.DefaultSeries,
91
		Series: coretesting.FakeDefaultSeries,
1494
92
		Jobs:   []state.MachineJob{state.JobHostUnits},
92
		Jobs:   []state.MachineJob{state.JobHostUnits},
1495
93
	}
93
	}
1496
94
	container, err := s.State.AddMachineInsideMachine(template, host.Id(), ctype)
94
	container, err := s.State.AddMachineInsideMachine(template, host.Id(), ctype)
1497
@@ -131,7 +131,7 @@
1498
131
	for _, ctype := range instance.ContainerTypes {
131
	for _, ctype := range instance.ContainerTypes {
1499
132
		// create a machine to host the container.
132
		// create a machine to host the container.
1500
133
		m, err := s.BackingState.AddOneMachine(state.MachineTemplate{
133
		m, err := s.BackingState.AddOneMachine(state.MachineTemplate{
1502
134
			Series:      config.DefaultSeries,
134
			Series:      coretesting.FakeDefaultSeries,
1503
135
			Jobs:        []state.MachineJob{state.JobHostUnits},
135
			Jobs:        []state.MachineJob{state.JobHostUnits},
1504
136
			Constraints: s.defaultConstraints,
136
			Constraints: s.defaultConstraints,
1505
137
		})
137
		})
1506
@@ -154,7 +154,7 @@
1507
154
154
1508
155
	// create a machine to host the container.
155
	// create a machine to host the container.
1509
156
	m, err := s.BackingState.AddOneMachine(state.MachineTemplate{
156
	m, err := s.BackingState.AddOneMachine(state.MachineTemplate{
1511
157
		Series:      config.DefaultSeries,
157
		Series:      coretesting.FakeDefaultSeries,
1512
158
		Jobs:        []state.MachineJob{state.JobHostUnits},
158
		Jobs:        []state.MachineJob{state.JobHostUnits},
1513
159
		Constraints: s.defaultConstraints,
159
		Constraints: s.defaultConstraints,
1514
160
	})
160
	})
1515
161
161
1516
=== modified file 'worker/provisioner/kvm-broker_test.go'
1517
--- worker/provisioner/kvm-broker_test.go	2014-04-02 11:35:49 +0000
1518
+++ worker/provisioner/kvm-broker_test.go	2014-04-03 17:37:27 +0000
1519
@@ -16,7 +16,6 @@
1520
16
	"launchpad.net/juju-core/container/kvm/mock"
16
	"launchpad.net/juju-core/container/kvm/mock"
1521
17
	kvmtesting "launchpad.net/juju-core/container/kvm/testing"
17
	kvmtesting "launchpad.net/juju-core/container/kvm/testing"
1522
18
	"launchpad.net/juju-core/environs"
18
	"launchpad.net/juju-core/environs"
1523
19
	"launchpad.net/juju-core/environs/config"
1524
20
	"launchpad.net/juju-core/errors"
19
	"launchpad.net/juju-core/errors"
1525
21
	"launchpad.net/juju-core/instance"
20
	"launchpad.net/juju-core/instance"
1526
22
	instancetest "launchpad.net/juju-core/instance/testing"
21
	instancetest "launchpad.net/juju-core/instance/testing"
1527
@@ -162,7 +161,7 @@
1528
162
161
1529
163
	// The kvm provisioner actually needs the machine it is being created on
162
	// The kvm provisioner actually needs the machine it is being created on
1530
164
	// to be in state, in order to get the watcher.
163
	// to be in state, in order to get the watcher.
1532
165
	m, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits, state.JobManageEnviron)
164
	m, err := s.State.AddMachine(coretesting.FakeDefaultSeries, state.JobHostUnits, state.JobManageEnviron)
1533
166
	c.Assert(err, gc.IsNil)
165
	c.Assert(err, gc.IsNil)
1534
167
	err = m.SetAddresses(instance.NewAddress("0.1.2.3", instance.NetworkUnknown))
166
	err = m.SetAddresses(instance.NewAddress("0.1.2.3", instance.NetworkUnknown))
1535
168
	c.Assert(err, gc.IsNil)
167
	c.Assert(err, gc.IsNil)
1536
@@ -227,7 +226,7 @@
1537
227
	defer stop(c, p)
226
	defer stop(c, p)
1538
228
227
1539
229
	// Check that an instance is not provisioned when the machine is created.
228
	// Check that an instance is not provisioned when the machine is created.
1541
230
	_, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits)
229
	_, err := s.State.AddMachine(coretesting.FakeDefaultSeries, state.JobHostUnits)
1542
231
	c.Assert(err, gc.IsNil)
230
	c.Assert(err, gc.IsNil)
1543
232
231
1544
233
	s.expectNoEvents(c)
232
	s.expectNoEvents(c)
1545
@@ -244,7 +243,7 @@
1546
244
243
1547
245
func (s *kvmProvisionerSuite) addContainer(c *gc.C) *state.Machine {
244
func (s *kvmProvisionerSuite) addContainer(c *gc.C) *state.Machine {
1548
246
	template := state.MachineTemplate{
245
	template := state.MachineTemplate{
1550
247
		Series: config.DefaultSeries,
246
		Series: coretesting.FakeDefaultSeries,
1551
248
		Jobs:   []state.MachineJob{state.JobHostUnits},
247
		Jobs:   []state.MachineJob{state.JobHostUnits},
1552
249
	}
248
	}
1553
250
	container, err := s.State.AddMachineInsideMachine(template, s.machineId, instance.KVM)
249
	container, err := s.State.AddMachineInsideMachine(template, s.machineId, instance.KVM)
1554
251
250
1555
=== modified file 'worker/provisioner/lxc-broker_test.go'
1556
--- worker/provisioner/lxc-broker_test.go	2014-04-02 11:35:49 +0000
1557
+++ worker/provisioner/lxc-broker_test.go	2014-04-03 17:37:27 +0000
1558
@@ -17,7 +17,6 @@
1559
17
	"launchpad.net/juju-core/container/lxc/mock"
17
	"launchpad.net/juju-core/container/lxc/mock"
1560
18
	lxctesting "launchpad.net/juju-core/container/lxc/testing"
18
	lxctesting "launchpad.net/juju-core/container/lxc/testing"
1561
19
	"launchpad.net/juju-core/environs"
19
	"launchpad.net/juju-core/environs"
1562
20
	"launchpad.net/juju-core/environs/config"
1563
21
	"launchpad.net/juju-core/errors"
20
	"launchpad.net/juju-core/errors"
1564
22
	"launchpad.net/juju-core/instance"
21
	"launchpad.net/juju-core/instance"
1565
23
	instancetest "launchpad.net/juju-core/instance/testing"
22
	instancetest "launchpad.net/juju-core/instance/testing"
1566
@@ -191,7 +190,7 @@
1567
191
190
1568
192
	// The lxc provisioner actually needs the machine it is being created on
191
	// The lxc provisioner actually needs the machine it is being created on
1569
193
	// to be in state, in order to get the watcher.
192
	// to be in state, in order to get the watcher.
1571
194
	m, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits, state.JobManageEnviron)
193
	m, err := s.State.AddMachine(coretesting.FakeDefaultSeries, state.JobHostUnits, state.JobManageEnviron)
1572
195
	c.Assert(err, gc.IsNil)
194
	c.Assert(err, gc.IsNil)
1573
196
	err = m.SetAddresses(instance.NewAddress("0.1.2.3", instance.NetworkUnknown))
195
	err = m.SetAddresses(instance.NewAddress("0.1.2.3", instance.NetworkUnknown))
1574
197
	c.Assert(err, gc.IsNil)
196
	c.Assert(err, gc.IsNil)
1575
@@ -260,7 +259,7 @@
1576
260
	defer stop(c, p)
259
	defer stop(c, p)
1577
261
260
1578
262
	// Check that an instance is not provisioned when the machine is created.
261
	// Check that an instance is not provisioned when the machine is created.
1580
263
	_, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits)
262
	_, err := s.State.AddMachine(coretesting.FakeDefaultSeries, state.JobHostUnits)
1581
264
	c.Assert(err, gc.IsNil)
263
	c.Assert(err, gc.IsNil)
1582
265
264
1583
266
	s.expectNoEvents(c)
265
	s.expectNoEvents(c)
1584
@@ -277,7 +276,7 @@
1585
277
276
1586
278
func (s *lxcProvisionerSuite) addContainer(c *gc.C) *state.Machine {
277
func (s *lxcProvisionerSuite) addContainer(c *gc.C) *state.Machine {
1587
279
	template := state.MachineTemplate{
278
	template := state.MachineTemplate{
1589
280
		Series: config.DefaultSeries,
279
		Series: coretesting.FakeDefaultSeries,
1590
281
		Jobs:   []state.MachineJob{state.JobHostUnits},
280
		Jobs:   []state.MachineJob{state.JobHostUnits},
1591
282
	}
281
	}
1592
283
	container, err := s.State.AddMachineInsideMachine(template, s.parentMachineId, instance.LXC)
282
	container, err := s.State.AddMachineInsideMachine(template, s.parentMachineId, instance.LXC)
1593
284
283
1594
=== modified file 'worker/provisioner/provisioner_test.go'
1595
--- worker/provisioner/provisioner_test.go	2014-04-02 07:50:15 +0000
1596
+++ worker/provisioner/provisioner_test.go	2014-04-03 17:37:27 +0000
1597
@@ -349,7 +349,7 @@
1598
349
349
1599
350
func (s *CommonProvisionerSuite) addMachineWithNetworks(includeNetworks, excludeNetworks []string) (*state.Machine, error) {
350
func (s *CommonProvisionerSuite) addMachineWithNetworks(includeNetworks, excludeNetworks []string) (*state.Machine, error) {
1600
351
	return s.BackingState.AddOneMachine(state.MachineTemplate{
351
	return s.BackingState.AddOneMachine(state.MachineTemplate{
1602
352
		Series:          config.DefaultSeries,
352
		Series:          coretesting.FakeDefaultSeries,
1603
353
		Jobs:            []state.MachineJob{state.JobHostUnits},
353
		Jobs:            []state.MachineJob{state.JobHostUnits},
1604
354
		Constraints:     s.defaultConstraints,
354
		Constraints:     s.defaultConstraints,
1605
355
		IncludeNetworks: includeNetworks,
355
		IncludeNetworks: includeNetworks,
1606
@@ -442,7 +442,7 @@
1607
442
442
1608
443
	// make a container on the machine we just created
443
	// make a container on the machine we just created
1609
444
	template := state.MachineTemplate{
444
	template := state.MachineTemplate{
1611
445
		Series: config.DefaultSeries,
445
		Series: coretesting.FakeDefaultSeries,
1612
446
		Jobs:   []state.MachineJob{state.JobHostUnits},
446
		Jobs:   []state.MachineJob{state.JobHostUnits},
1613
447
	}
447
	}
1614
448
	container, err := s.State.AddMachineInsideMachine(template, m.Id(), instance.LXC)
448
	container, err := s.State.AddMachineInsideMachine(template, m.Id(), instance.LXC)
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-03-26	Pending
Review via email: mp+212755@code.launchpad.net