From 70780fc4ef649b16f31623bd3abaf211ac142960 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Wed, 24 Jun 2015 17:46:34 +0200
Subject: [PATCH] New Xapi#ejectCdFromVm().

---
 src/api/vm.coffee | 19 ++-----------------
 src/xapi.js       | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/api/vm.coffee b/src/api/vm.coffee
index e62b270d2..2fae1429c 100644
--- a/src/api/vm.coffee
+++ b/src/api/vm.coffee
@@ -130,23 +130,8 @@ exports.delete = delete_
 #---------------------------------------------------------------------
 
 ejectCd = $coroutine ({vm}) ->
-  xapi = @getXAPI vm
-
-  # Finds the CD drive.
-  cdDriveRef = null
-  $forEach (@getObjects vm.$VBDs), (VBD) ->
-    if VBD.is_cd_drive
-      cdDriveRef = VBD.ref
-      return false
-    return
-
-  if cdDriveRef
-    yield xapi.call 'VBD.eject', cdDriveRef
-
-    # Silently attempts to destroy the VBD.
-    xapi.call('VBD.destroy', cdDriveRef).catch(->)
-
-  return true
+  yield @getXAPI(vm).ejectCdFromVm(vm)
+  return
 
 ejectCd.params = {
   id: { type: 'string' }
diff --git a/src/xapi.js b/src/xapi.js
index d78dc4496..8cf685f4b 100644
--- a/src/xapi.js
+++ b/src/xapi.js
@@ -717,13 +717,20 @@ export default class Xapi extends XapiBase {
   }
 
   _getVmCdDrive (vm) {
-    for (let vbd of vm.$VBDs) {
+    for (const vbd of vm.$VBDs) {
       if (vbd.type === 'CD') {
         return vbd
       }
     }
   }
 
+  async _ejectCdFromVm (vm) {
+    const cdDrive = this._getVmCdDrive(vm)
+    if (cdDrive) {
+      await this.call('VBD.eject', cdDrive.$ref)
+    }
+  }
+
   async _insertCdIntoVm (cd, vm, {
     bootable = false,
     force = false
@@ -772,6 +779,10 @@ export default class Xapi extends XapiBase {
     await this._deleteVdi(this.getObject(vdiId))
   }
 
+  async ejectCdFromVm (vmId) {
+    await this._ejectCdFromVm(this.getObject(vmId))
+  }
+
   async insertCdIntoVm (cdId, vmId, opts = undefined) {
     await this._insertCdIntoVm(
       this.getObject(cdId),