← Back to branch summary

~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/provisioner/provisioninginfo_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/apiserver/provisioner/provisioninginfo_test.go
25
25
        _, err := pm.Create("static-pool", "static", map[string]interface{}{"foo": "bar"})
26
26
        c.Assert(err, jc.ErrorIsNil)
27
27
 
28
 
        cons := constraints.MustParse("cpu-cores=123 mem=8G")
 
28
        cons := constraints.MustParse("cores=123 mem=8G")
29
29
        template := state.MachineTemplate{
30
30
                Series:      "quantal",
31
31
                Jobs:        []state.MachineJob{state.JobHostUnits},
116
116
func (s *withoutControllerSuite) TestProvisioningInfoWithSingleNegativeAndPositiveSpaceInConstraints(c *gc.C) {
117
117
        s.addSpacesAndSubnets(c)
118
118
 
119
 
        cons := constraints.MustParse("cpu-cores=123 mem=8G spaces=^space1,space2")
 
119
        cons := constraints.MustParse("cores=123 mem=8G spaces=^space1,space2")
120
120
        template := state.MachineTemplate{
121
121
                Series:      "quantal",
122
122
                Jobs:        []state.MachineJob{state.JobHostUnits},
234
234
        _, err := s.State.AddSpace("empty", "", nil, true)
235
235
        c.Assert(err, jc.ErrorIsNil)
236
236
 
237
 
        consEmptySpace := constraints.MustParse("cpu-cores=123 mem=8G spaces=empty")
238
 
        consMissingSpace := constraints.MustParse("cpu-cores=123 mem=8G spaces=missing")
 
237
        consEmptySpace := constraints.MustParse("cores=123 mem=8G spaces=empty")
 
238
        consMissingSpace := constraints.MustParse("cores=123 mem=8G spaces=missing")
239
239
        templates := []state.MachineTemplate{{
240
240
                Series:      "quantal",
241
241
                Jobs:        []state.MachineJob{state.JobHostUnits},