NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various updates.

Browse Source
This commit is contained in:
Julien Fontanet 2014-01-16 16:45:54 +01:00
parent 60c46d529c
commit 00027434ad
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/spec.coffee
View File

@ -334,7 +334,7 @@ module.exports = ->
if $isVMRunning.call this if $isVMRunning.call this
@genval.resident_on @genval.resident_on
else else
# TODO: Handle local VMs. # TODO: Handle local VMs. (`get_possible_hosts()`).
@genval.$poolRef @genval.$poolRef
snapshots: -> @genval.snapshots snapshots: -> @genval.snapshots
@ -490,7 +490,19 @@ module.exports = ->
@val = { @val = {
attached: -> @genval.currently_attached attached: -> @genval.currently_attached
VDI: -> @genval.VDI bootable: -> @genval.bootable
read_only: -> @genval.mode is 'RO'
# null if empty.
#
# TODO: Is it really equivalent?
VDI: ->
VDI = @genval.VDI
if VDI is 'OpaqueRef:NULL'
null
else
VDI
VM: -> @genval.VM VM: -> @genval.VM
} }

6
src/spec.spec.coffee
View File

@ -307,6 +307,8 @@ describe 'spec', ->
$expect(vm.template_info).to.be.an 'object' $expect(vm.template_info).to.be.an 'object'
$expect(vm.template_info.arch).to.equal 'amd64'
$expect(vm.template_info.disks).to.deep.equal [ $expect(vm.template_info.disks).to.deep.equal [
{ {
device: '0' device: '0'
@ -455,6 +457,10 @@ describe 'spec', ->
$expect(vbd.attached).to.be.true $expect(vbd.attached).to.be.true
$expect(vbd.bootable).to.be.false
$expect(vbd.read_only).to.be.false
$expect(vbd.VDI).to.equal 'OpaqueRef:1f7f9828-f4e7-41dd-20e6-3bf57c559a78' $expect(vbd.VDI).to.equal 'OpaqueRef:1f7f9828-f4e7-41dd-20e6-3bf57c559a78'
$expect(vbd.VM).to.equal 'OpaqueRef:be2390b2-cd08-53f5-3fae-b76f6f3725bf' $expect(vbd.VM).to.equal 'OpaqueRef:be2390b2-cd08-53f5-3fae-b76f6f3725bf'