1
=== modified file 'juju/testing/conn.go'
2
--- juju/testing/conn.go	2014-02-18 01:29:47 +0000
3
+++ juju/testing/conn.go	2014-02-20 04:59:53 +0000
4
@@ -177,8 +177,7 @@
5
177
	err = os.Mkdir(osenv.JujuHome(), 0777)
177
	err = os.Mkdir(osenv.JujuHome(), 0777)
6
178
	c.Assert(err, gc.IsNil)
178
	c.Assert(err, gc.IsNil)
7
179
179
10
180
	dataDir := filepath.Join(s.RootDir, "/var/lib/juju")
180
	err = os.MkdirAll(s.DataDir(), 0777)
9
181
	err = os.MkdirAll(dataDir, 0777)
11
182
	c.Assert(err, gc.IsNil)
181
	c.Assert(err, gc.IsNil)
12
183
	s.PatchEnvironment(osenv.JujuEnvEnvKey, "")
182
	s.PatchEnvironment(osenv.JujuEnvEnvKey, "")
13
184
183
14
@@ -201,6 +200,7 @@
15
201
	c.Assert(err, gc.IsNil)
200
	c.Assert(err, gc.IsNil)
16
202
	// sanity check we've got the correct environment.
201
	// sanity check we've got the correct environment.
17
203
	c.Assert(environ.Name(), gc.Equals, "dummyenv")
202
	c.Assert(environ.Name(), gc.Equals, "dummyenv")
18
203
	s.PatchValue(&dummy.DataDir, s.DataDir())
19
204
204
20
205
	envtesting.MustUploadFakeTools(environ.Storage())
205
	envtesting.MustUploadFakeTools(environ.Storage())
21
206
	c.Assert(bootstrap.Bootstrap(ctx, environ, constraints.Value{}), gc.IsNil)
206
	c.Assert(bootstrap.Bootstrap(ctx, environ, constraints.Value{}), gc.IsNil)
22
207
207
23
=== modified file 'provider/dummy/environs.go'
24
--- provider/dummy/environs.go	2014-02-13 02:46:58 +0000
25
+++ provider/dummy/environs.go	2014-02-20 04:59:53 +0000
26
@@ -490,6 +490,9 @@
27
490
490
28
491
var errBroken = errors.New("broken environment")
491
var errBroken = errors.New("broken environment")
29
492
492
30
493
// Override for testing - the data directory with which the state api server is initialised.
31
494
var DataDir = ""
32
495
33
493
func (e *environ) ecfg() *environConfig {
496
func (e *environ) ecfg() *environConfig {
34
494
	e.ecfgMutex.Lock()
497
	e.ecfgMutex.Lock()
35
495
	ecfg := e.ecfgUnlocked
498
	ecfg := e.ecfgUnlocked
36
@@ -585,7 +588,7 @@
37
585
		if err != nil {
588
		if err != nil {
38
586
			panic(err)
589
			panic(err)
39
587
		}
590
		}
41
588
		estate.apiServer, err = apiserver.NewServer(st, "localhost:0", []byte(testing.ServerCert), []byte(testing.ServerKey), "")
591
		estate.apiServer, err = apiserver.NewServer(st, "localhost:0", []byte(testing.ServerCert), []byte(testing.ServerKey), DataDir)
42
589
		if err != nil {
592
		if err != nil {
43
590
			panic(err)
593
			panic(err)
44
591
		}
594
		}
45
592
595
46
=== modified file 'state/api/upgrader/unitupgrader_test.go'
47
--- state/api/upgrader/unitupgrader_test.go	2014-02-19 01:26:15 +0000
48
+++ state/api/upgrader/unitupgrader_test.go	2014-02-20 04:59:53 +0000
49
@@ -11,7 +11,6 @@
50
11
11
51
12
	gc "launchpad.net/gocheck"
12
	gc "launchpad.net/gocheck"
52
13
13
53
14
	"launchpad.net/juju-core/environs"
54
15
	"launchpad.net/juju-core/errors"
14
	"launchpad.net/juju-core/errors"
55
16
	jujutesting "launchpad.net/juju-core/juju/testing"
15
	jujutesting "launchpad.net/juju-core/juju/testing"
56
17
	"launchpad.net/juju-core/state"
16
	"launchpad.net/juju-core/state"
57
@@ -54,9 +53,7 @@
58
54
	s.stateAPI = s.OpenAPIAs(c, s.rawUnit.Tag(), password)
53
	s.stateAPI = s.OpenAPIAs(c, s.rawUnit.Tag(), password)
59
55
54
60
56
	// Set up fake downloaded tools for the assigned machine.
55
	// Set up fake downloaded tools for the assigned machine.
64
57
	libDir := c.MkDir()
56
	fakeToolsPath := filepath.Join(s.DataDir(), "tools", version.Current.String())
62
58
	s.PatchValue(&environs.DataDir, libDir)
63
59
	fakeToolsPath := filepath.Join(libDir, "tools", version.Current.String())
65
60
	err = os.MkdirAll(fakeToolsPath, 0700)
57
	err = os.MkdirAll(fakeToolsPath, 0700)
66
61
	c.Assert(err, gc.IsNil)
58
	c.Assert(err, gc.IsNil)
67
62
	s.fakeTools = &tools.Tools{
59
	s.fakeTools = &tools.Tools{
68
63
60
69
=== modified file 'state/apiserver/root.go'
70
--- state/apiserver/root.go	2014-02-18 00:15:30 +0000
71
+++ state/apiserver/root.go	2014-02-20 04:59:53 +0000
72
@@ -211,7 +211,7 @@
73
211
	case names.MachineTagKind:
211
	case names.MachineTagKind:
74
212
		return upgrader.NewUpgraderAPI(r.srv.state, r.resources, r)
212
		return upgrader.NewUpgraderAPI(r.srv.state, r.resources, r)
75
213
	case names.UnitTagKind:
213
	case names.UnitTagKind:
77
214
		return upgrader.NewUnitUpgraderAPI(r.srv.state, r.resources, r)
214
		return upgrader.NewUnitUpgraderAPI(r.srv.state, r.resources, r, r.srv.dataDir)
78
215
	}
215
	}
79
216
	// Not a machine or unit.
216
	// Not a machine or unit.
80
217
	return nil, common.ErrPerm
217
	return nil, common.ErrPerm
81
218
218
82
=== modified file 'state/apiserver/upgrader/unitupgrader.go'
83
--- state/apiserver/upgrader/unitupgrader.go	2014-02-19 01:26:15 +0000
84
+++ state/apiserver/upgrader/unitupgrader.go	2014-02-20 04:59:53 +0000
85
@@ -5,7 +5,6 @@
86
5
5
87
6
import (
6
import (
88
7
	agenttools "launchpad.net/juju-core/agent/tools"
7
	agenttools "launchpad.net/juju-core/agent/tools"
89
8
	"launchpad.net/juju-core/environs"
90
9
	"launchpad.net/juju-core/names"
8
	"launchpad.net/juju-core/names"
91
10
	"launchpad.net/juju-core/state"
9
	"launchpad.net/juju-core/state"
92
11
	"launchpad.net/juju-core/state/api/params"
10
	"launchpad.net/juju-core/state/api/params"
93
@@ -22,6 +21,7 @@
94
22
	st         *state.State
21
	st         *state.State
95
23
	resources  *common.Resources
22
	resources  *common.Resources
96
24
	authorizer common.Authorizer
23
	authorizer common.Authorizer
97
24
	dataDir    string
98
25
}
25
}
99
26
26
100
27
// NewUnitUpgraderAPI creates a new server-side UnitUpgraderAPI facade.
27
// NewUnitUpgraderAPI creates a new server-side UnitUpgraderAPI facade.
101
@@ -29,6 +29,7 @@
102
29
	st *state.State,
29
	st *state.State,
103
30
	resources *common.Resources,
30
	resources *common.Resources,
104
31
	authorizer common.Authorizer,
31
	authorizer common.Authorizer,
105
32
	dataDir string,
106
32
) (*UnitUpgraderAPI, error) {
33
) (*UnitUpgraderAPI, error) {
107
33
	if !authorizer.AuthUnitAgent() {
34
	if !authorizer.AuthUnitAgent() {
108
34
		return nil, common.ErrPerm
35
		return nil, common.ErrPerm
109
@@ -42,6 +43,7 @@
110
42
		st:          st,
43
		st:          st,
111
43
		resources:   resources,
44
		resources:   resources,
112
44
		authorizer:  authorizer,
45
		authorizer:  authorizer,
113
46
		dataDir:     dataDir,
114
45
	}, nil
47
	}, nil
115
46
}
48
}
116
47
49
117
@@ -144,7 +146,7 @@
118
144
	// download the tools even though they already have been fetched by the machine agent. Newer upgrader
146
	// download the tools even though they already have been fetched by the machine agent. Newer upgrader
119
145
	// workers do not have this problem. So to be compatible across all versions, we return the full tools
147
	// workers do not have this problem. So to be compatible across all versions, we return the full tools
120
146
	// metadata as recorded in the downloaded tools directory.
148
	// metadata as recorded in the downloaded tools directory.
122
147
	downloadedTools, err := agenttools.ReadTools(environs.DataDir, machineTools.Version)
149
	downloadedTools, err := agenttools.ReadTools(u.dataDir, machineTools.Version)
123
148
	if err != nil {
150
	if err != nil {
124
149
		return nil, err
151
		return nil, err
125
150
	}
152
	}
126
151
153
127
=== modified file 'state/apiserver/upgrader/unitupgrader_test.go'
128
--- state/apiserver/upgrader/unitupgrader_test.go	2014-02-19 02:07:19 +0000
129
+++ state/apiserver/upgrader/unitupgrader_test.go	2014-02-20 04:59:53 +0000
130
@@ -11,7 +11,6 @@
131
11
11
132
12
	gc "launchpad.net/gocheck"
12
	gc "launchpad.net/gocheck"
133
13
13
134
14
	"launchpad.net/juju-core/environs"
135
15
	"launchpad.net/juju-core/errors"
14
	"launchpad.net/juju-core/errors"
136
16
	jujutesting "launchpad.net/juju-core/juju/testing"
15
	jujutesting "launchpad.net/juju-core/juju/testing"
137
17
	"launchpad.net/juju-core/state"
16
	"launchpad.net/juju-core/state"
138
@@ -63,13 +62,8 @@
139
63
		LoggedIn:  true,
62
		LoggedIn:  true,
140
64
		UnitAgent: true,
63
		UnitAgent: true,
141
65
	}
64
	}
142
66
	s.upgrader, err = upgrader.NewUnitUpgraderAPI(s.State, s.resources, s.authorizer)
143
67
	c.Assert(err, gc.IsNil)
144
68
145
69
	// Set up fake downloaded tools for the assigned machine.
65
	// Set up fake downloaded tools for the assigned machine.
149
70
	libDir := c.MkDir()
66
	fakeToolsPath := filepath.Join(s.DataDir(), "tools", version.Current.String())
147
71
	s.PatchValue(&environs.DataDir, libDir)
148
72
	fakeToolsPath := filepath.Join(libDir, "tools", version.Current.String())
150
73
	err = os.MkdirAll(fakeToolsPath, 0700)
67
	err = os.MkdirAll(fakeToolsPath, 0700)
151
74
	c.Assert(err, gc.IsNil)
68
	c.Assert(err, gc.IsNil)
152
75
	s.fakeTools = &tools.Tools{
69
	s.fakeTools = &tools.Tools{
153
@@ -82,6 +76,9 @@
154
82
	c.Assert(err, gc.IsNil)
76
	c.Assert(err, gc.IsNil)
155
83
	err = ioutil.WriteFile(filepath.Join(fakeToolsPath, "downloaded-tools.txt"), []byte(toolsMetadataData), 0644)
77
	err = ioutil.WriteFile(filepath.Join(fakeToolsPath, "downloaded-tools.txt"), []byte(toolsMetadataData), 0644)
156
84
	c.Assert(err, gc.IsNil)
78
	c.Assert(err, gc.IsNil)
157
79
158
80
	s.upgrader, err = upgrader.NewUnitUpgraderAPI(s.State, s.resources, s.authorizer, s.DataDir())
159
81
	c.Assert(err, gc.IsNil)
160
85
}
82
}
161
86
83
162
87
func (s *unitUpgraderSuite) TearDownTest(c *gc.C) {
84
func (s *unitUpgraderSuite) TearDownTest(c *gc.C) {
163
@@ -125,7 +122,7 @@
164
125
	anAuthorizer := s.authorizer
122
	anAuthorizer := s.authorizer
165
126
	anAuthorizer.MachineAgent = true
123
	anAuthorizer.MachineAgent = true
166
127
	anAuthorizer.UnitAgent = false
124
	anAuthorizer.UnitAgent = false
168
128
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer)
125
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer, "")
169
129
	c.Check(err, gc.NotNil)
126
	c.Check(err, gc.NotNil)
170
130
	c.Check(anUpgrader, gc.IsNil)
127
	c.Check(anUpgrader, gc.IsNil)
171
131
	c.Assert(err, gc.ErrorMatches, "permission denied")
128
	c.Assert(err, gc.ErrorMatches, "permission denied")
172
@@ -135,7 +132,7 @@
173
135
	// We are a unit agent, but not the one we are trying to track
132
	// We are a unit agent, but not the one we are trying to track
174
136
	anAuthorizer := s.authorizer
133
	anAuthorizer := s.authorizer
175
137
	anAuthorizer.Tag = "unit-wordpress-12354"
134
	anAuthorizer.Tag = "unit-wordpress-12354"
177
138
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer)
135
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer, "")
178
139
	c.Check(err, gc.IsNil)
136
	c.Check(err, gc.IsNil)
179
140
	args := params.Entities{
137
	args := params.Entities{
180
141
		Entities: []params.Entity{{Tag: s.rawUnit.Tag()}},
138
		Entities: []params.Entity{{Tag: s.rawUnit.Tag()}},
181
@@ -158,7 +155,7 @@
182
158
func (s *unitUpgraderSuite) TestToolsRefusesWrongAgent(c *gc.C) {
155
func (s *unitUpgraderSuite) TestToolsRefusesWrongAgent(c *gc.C) {
183
159
	anAuthorizer := s.authorizer
156
	anAuthorizer := s.authorizer
184
160
	anAuthorizer.Tag = "unit-wordpress-12354"
157
	anAuthorizer.Tag = "unit-wordpress-12354"
186
161
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer)
158
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer, "")
187
162
	c.Check(err, gc.IsNil)
159
	c.Check(err, gc.IsNil)
188
163
	args := params.Entities{
160
	args := params.Entities{
189
164
		Entities: []params.Entity{{Tag: s.rawUnit.Tag()}},
161
		Entities: []params.Entity{{Tag: s.rawUnit.Tag()}},
190
@@ -202,7 +199,7 @@
191
202
func (s *unitUpgraderSuite) TestSetToolsRefusesWrongAgent(c *gc.C) {
199
func (s *unitUpgraderSuite) TestSetToolsRefusesWrongAgent(c *gc.C) {
192
203
	anAuthorizer := s.authorizer
200
	anAuthorizer := s.authorizer
193
204
	anAuthorizer.Tag = "unit-wordpress-12354"
201
	anAuthorizer.Tag = "unit-wordpress-12354"
195
205
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer)
202
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer, "")
196
206
	c.Check(err, gc.IsNil)
203
	c.Check(err, gc.IsNil)
197
207
	args := params.EntitiesVersion{
204
	args := params.EntitiesVersion{
198
208
		AgentTools: []params.EntityVersion{{
205
		AgentTools: []params.EntityVersion{{
199
@@ -259,7 +256,7 @@
200
259
func (s *unitUpgraderSuite) TestDesiredVersionRefusesWrongAgent(c *gc.C) {
256
func (s *unitUpgraderSuite) TestDesiredVersionRefusesWrongAgent(c *gc.C) {
201
260
	anAuthorizer := s.authorizer
257
	anAuthorizer := s.authorizer
202
261
	anAuthorizer.Tag = "unit-wordpress-12354"
258
	anAuthorizer.Tag = "unit-wordpress-12354"
204
262
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer)
259
	anUpgrader, err := upgrader.NewUnitUpgraderAPI(s.State, s.resources, anAuthorizer, "")
205
263
	c.Check(err, gc.IsNil)
260
	c.Check(err, gc.IsNil)
206
264
	args := params.Entities{
261
	args := params.Entities{
207
265
		Entities: []params.Entity{{Tag: s.rawUnit.Tag()}},
262
		Entities: []params.Entity{{Tag: s.rawUnit.Tag()}},
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-02-20	Pending
Review via email: mp+207345@code.launchpad.net