← Back to branch summary

~wwitzel3/juju-core/030-MA-HA

« back to all changes in this revision

Viewing changes to worker/provisioner/provisioner_test.go

  • Committer: Wayne Witzel III
  • Date: 2014-04-04 18:00:54 UTC
  • mfrom: (2263.2.307 juju-core)
  • Revision ID: wayne.witzel@canonical.com-20140404180054-6c01jagmwfcsha25
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
worker/provisioner/provisioner_test.go
344
344
}
345
345
 
346
346
func (s *CommonProvisionerSuite) addMachine() (*state.Machine, error) {
347
 
        return s.addMachineWithNetworks(nil, nil)
 
347
        return s.addMachineWithRequestedNetworks(nil, nil)
348
348
}
349
349
 
350
 
func (s *CommonProvisionerSuite) addMachineWithNetworks(includeNetworks, excludeNetworks []string) (*state.Machine, error) {
 
350
func (s *CommonProvisionerSuite) addMachineWithRequestedNetworks(includeNetworks, excludeNetworks []string) (*state.Machine, error) {
351
351
        return s.BackingState.AddOneMachine(state.MachineTemplate{
352
 
                Series:          config.DefaultSeries,
 
352
                Series:          coretesting.FakeDefaultSeries,
353
353
                Jobs:            []state.MachineJob{state.JobHostUnits},
354
354
                Constraints:     s.defaultConstraints,
355
355
                IncludeNetworks: includeNetworks,
442
442
 
443
443
        // make a container on the machine we just created
444
444
        template := state.MachineTemplate{
445
 
                Series: config.DefaultSeries,
 
445
                Series: coretesting.FakeDefaultSeries,
446
446
                Jobs:   []state.MachineJob{state.JobHostUnits},
447
447
        }
448
448
        container, err := s.State.AddMachineInsideMachine(template, m.Id(), instance.LXC)
459
459
        s.waitRemoved(c, m)
460
460
}
461
461
 
462
 
func (s *ProvisionerSuite) TestProvisioningMachinesWithNetworks(c *gc.C) {
 
462
func (s *ProvisionerSuite) TestProvisioningMachinesWithRequestedNetworks(c *gc.C) {
463
463
        p := s.newEnvironProvisioner(c)
464
464
        defer stop(c, p)
465
465
 
466
466
        // Add and provision a machine with networks specified.
467
467
        includeNetworks := []string{"net1", "net2"}
468
468
        excludeNetworks := []string{"net3", "net4"}
469
 
        m, err := s.addMachineWithNetworks(includeNetworks, excludeNetworks)
 
469
        m, err := s.addMachineWithRequestedNetworks(includeNetworks, excludeNetworks)
470
470
        c.Assert(err, gc.IsNil)
471
471
        inst := s.checkStartInstanceCustom(c, m, "pork", s.defaultConstraints, includeNetworks, excludeNetworks)
472
472