OLD | NEW |
1 // Copyright 2013 Canonical Ltd. | 1 // Copyright 2013 Canonical Ltd. |
2 // Licensed under the AGPLv3, see LICENCE file for details. | 2 // Licensed under the AGPLv3, see LICENCE file for details. |
3 | 3 |
4 package provisioner_test | 4 package provisioner_test |
5 | 5 |
6 import ( | 6 import ( |
7 "fmt" | 7 "fmt" |
8 "path/filepath" | 8 "path/filepath" |
9 "time" | 9 "time" |
10 | 10 |
11 jc "github.com/juju/testing/checkers" | 11 jc "github.com/juju/testing/checkers" |
12 gc "launchpad.net/gocheck" | 12 gc "launchpad.net/gocheck" |
13 | 13 |
14 "launchpad.net/juju-core/agent" | 14 "launchpad.net/juju-core/agent" |
15 "launchpad.net/juju-core/constraints" | 15 "launchpad.net/juju-core/constraints" |
| 16 "launchpad.net/juju-core/container" |
16 "launchpad.net/juju-core/container/kvm/mock" | 17 "launchpad.net/juju-core/container/kvm/mock" |
17 kvmtesting "launchpad.net/juju-core/container/kvm/testing" | 18 kvmtesting "launchpad.net/juju-core/container/kvm/testing" |
18 "launchpad.net/juju-core/environs" | 19 "launchpad.net/juju-core/environs" |
19 "launchpad.net/juju-core/errors" | 20 "launchpad.net/juju-core/errors" |
20 "launchpad.net/juju-core/instance" | 21 "launchpad.net/juju-core/instance" |
21 instancetest "launchpad.net/juju-core/instance/testing" | 22 instancetest "launchpad.net/juju-core/instance/testing" |
22 jujutesting "launchpad.net/juju-core/juju/testing" | 23 jujutesting "launchpad.net/juju-core/juju/testing" |
23 "launchpad.net/juju-core/names" | 24 "launchpad.net/juju-core/names" |
24 "launchpad.net/juju-core/state" | 25 "launchpad.net/juju-core/state" |
25 coretesting "launchpad.net/juju-core/testing" | 26 coretesting "launchpad.net/juju-core/testing" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 agent.AgentConfigParams{ | 69 agent.AgentConfigParams{ |
69 DataDir: "/not/used/here", | 70 DataDir: "/not/used/here", |
70 Tag: "tag", | 71 Tag: "tag", |
71 UpgradedToVersion: version.Current.Number, | 72 UpgradedToVersion: version.Current.Number, |
72 Password: "dummy-secret", | 73 Password: "dummy-secret", |
73 Nonce: "nonce", | 74 Nonce: "nonce", |
74 APIAddresses: []string{"10.0.0.1:1234"}, | 75 APIAddresses: []string{"10.0.0.1:1234"}, |
75 CACert: coretesting.CACert, | 76 CACert: coretesting.CACert, |
76 }) | 77 }) |
77 c.Assert(err, gc.IsNil) | 78 c.Assert(err, gc.IsNil) |
78 » s.broker, err = provisioner.NewKvmBroker(&fakeAPI{}, tools, s.agentConfi
g) | 79 » managerConfig := container.ManagerConfig{container.ConfigName: "juju"} |
| 80 » s.broker, err = provisioner.NewKvmBroker(&fakeAPI{}, tools, s.agentConfi
g, managerConfig) |
79 c.Assert(err, gc.IsNil) | 81 c.Assert(err, gc.IsNil) |
80 } | 82 } |
81 | 83 |
82 func (s *kvmBrokerSuite) startInstance(c *gc.C, machineId string) instance.Insta
nce { | 84 func (s *kvmBrokerSuite) startInstance(c *gc.C, machineId string) instance.Insta
nce { |
83 machineNonce := "fake-nonce" | 85 machineNonce := "fake-nonce" |
84 stateInfo := jujutesting.FakeStateInfo(machineId) | 86 stateInfo := jujutesting.FakeStateInfo(machineId) |
85 apiInfo := jujutesting.FakeAPIInfo(machineId) | 87 apiInfo := jujutesting.FakeAPIInfo(machineId) |
86 machineConfig := environs.NewMachineConfig(machineId, machineNonce, nil,
nil, stateInfo, apiInfo) | 88 machineConfig := environs.NewMachineConfig(machineId, machineNonce, nil,
nil, stateInfo, apiInfo) |
87 cons := constraints.Value{} | 89 cons := constraints.Value{} |
88 possibleTools := s.broker.(coretools.HasTools).Tools("precise") | 90 possibleTools := s.broker.(coretools.HasTools).Tools("precise") |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 close(s.events) | 214 close(s.events) |
213 s.kvmSuite.TearDownTest(c) | 215 s.kvmSuite.TearDownTest(c) |
214 s.CommonProvisionerSuite.TearDownTest(c) | 216 s.CommonProvisionerSuite.TearDownTest(c) |
215 } | 217 } |
216 | 218 |
217 func (s *kvmProvisionerSuite) newKvmProvisioner(c *gc.C) provisioner.Provisioner
{ | 219 func (s *kvmProvisionerSuite) newKvmProvisioner(c *gc.C) provisioner.Provisioner
{ |
218 machineTag := names.MachineTag(s.machineId) | 220 machineTag := names.MachineTag(s.machineId) |
219 agentConfig := s.AgentConfigForTag(c, machineTag) | 221 agentConfig := s.AgentConfigForTag(c, machineTag) |
220 tools, err := s.provisioner.Tools(agentConfig.Tag()) | 222 tools, err := s.provisioner.Tools(agentConfig.Tag()) |
221 c.Assert(err, gc.IsNil) | 223 c.Assert(err, gc.IsNil) |
222 » broker, err := provisioner.NewKvmBroker(s.provisioner, tools, agentConfi
g) | 224 » managerConfig := container.ManagerConfig{container.ConfigName: "juju"} |
| 225 » broker, err := provisioner.NewKvmBroker(s.provisioner, tools, agentConfi
g, managerConfig) |
223 c.Assert(err, gc.IsNil) | 226 c.Assert(err, gc.IsNil) |
224 return provisioner.NewContainerProvisioner(instance.KVM, s.provisioner,
agentConfig, broker) | 227 return provisioner.NewContainerProvisioner(instance.KVM, s.provisioner,
agentConfig, broker) |
225 } | 228 } |
226 | 229 |
227 func (s *kvmProvisionerSuite) TestProvisionerStartStop(c *gc.C) { | 230 func (s *kvmProvisionerSuite) TestProvisionerStartStop(c *gc.C) { |
228 p := s.newKvmProvisioner(c) | 231 p := s.newKvmProvisioner(c) |
229 c.Assert(p.Stop(), gc.IsNil) | 232 c.Assert(p.Stop(), gc.IsNil) |
230 } | 233 } |
231 | 234 |
232 func (s *kvmProvisionerSuite) TestDoesNotStartEnvironMachines(c *gc.C) { | 235 func (s *kvmProvisionerSuite) TestDoesNotStartEnvironMachines(c *gc.C) { |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 | 268 |
266 container := s.addContainer(c) | 269 container := s.addContainer(c) |
267 | 270 |
268 instId := s.expectStarted(c, container) | 271 instId := s.expectStarted(c, container) |
269 | 272 |
270 // ...and removed, along with the machine, when the machine is Dead. | 273 // ...and removed, along with the machine, when the machine is Dead. |
271 c.Assert(container.EnsureDead(), gc.IsNil) | 274 c.Assert(container.EnsureDead(), gc.IsNil) |
272 s.expectStopped(c, instId) | 275 s.expectStopped(c, instId) |
273 s.waitRemoved(c, container) | 276 s.waitRemoved(c, container) |
274 } | 277 } |
OLD | NEW |