Add an os-disk constraint

state/state_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package state_test
 
 import (
         "fmt"
         "net/url"
         "strconv"
         "strings"
@@ skipping 304 matching lines @@
         _, err = s.State.InjectMachine("series", emptyCons, instance.Id("i-mlazy"), hc)
         c.Assert(err, gc.ErrorMatches, "cannot add a new machine: no jobs specified")
 }
 
 func (s *StateSuite) TestInjectMachine(c *gc.C) {
         cons := constraints.MustParse("mem=4G")
         arch := "amd64"
         mem := uint64(1024)
         disk := uint64(1024)
         hc := instance.HardwareCharacteristics{
-                Arch:   &arch,
-                Mem:    &mem,
-                OsDisk: &disk,
+                Arch:     &arch,
+                Mem:      &mem,
+                RootDisk: &disk,
         }
         m, err := s.State.InjectMachine("series", cons, instance.Id("i-mindustrious"), hc, state.JobHostUnits, state.JobManageEnviron)
         c.Assert(err, gc.IsNil)
         c.Assert(m.Jobs(), gc.DeepEquals, []state.MachineJob{state.JobHostUnits, state.JobManageEnviron})
         instanceId, err := m.InstanceId()
         c.Assert(err, gc.IsNil)
         c.Assert(instanceId, gc.Equals, instance.Id("i-mindustrious"))
         mcons, err := m.Constraints()
         c.Assert(err, gc.IsNil)
         c.Assert(cons, gc.DeepEquals, mcons)
@@ skipping 1407 matching lines @@
         c.Assert(state.ParentId("0"), gc.Equals, "")
         c.Assert(state.ParentId("0/lxc/1"), gc.Equals, "0")
         c.Assert(state.ParentId("0/lxc/1/kvm/0"), gc.Equals, "0/lxc/1")
 }
 
 func (s *StateSuite) TestContainerTypeFromId(c *gc.C) {
         c.Assert(state.ContainerTypeFromId("0"), gc.Equals, instance.ContainerType(""))
         c.Assert(state.ContainerTypeFromId("0/lxc/1"), gc.Equals, instance.LXC)
         c.Assert(state.ContainerTypeFromId("0/lxc/1/kvm/0"), gc.Equals, instance.KVM)
 }