chore(xo-server): use @xen-orchestra/xapi/VBD_unplug

vatesfr · Jun 2, 2022 · 379e4d7 · 379e4d7
1 parent 9860bd7
commit 379e4d7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/packages/xo-server/src/api/vbd.mjs b/packages/xo-server/src/api/vbd.mjs
@@ -17,8 +17,7 @@ export { delete_ as delete }
 // -------------------------------------------------------------------
 
 export async function disconnect({ vbd }) {
-  const xapi = this.getXapi(vbd)
-  await xapi.disconnectVbd(vbd._xapiRef)
+  await this.getXapiObject(vbd).$unplug()
 }
 
 disconnect.params = {

diff --git a/packages/xo-server/src/api/xosan.mjs b/packages/xo-server/src/api/xosan.mjs
@@ -812,7 +812,7 @@ async function replaceBrickOnSameVM(xosansr, previousBrick, newLvmSr, brickSize)
     CURRENT_POOL_OPERATIONS[poolId] = { ...OPERATION_OBJECT, state: 3 }
     await umountDisk(localEndpoint, previousBrickRoot)
     const previousVBD = previousVM.$VBDs.find(vbd => vbd.device === previousBrickDevice)
-    await xapi.disconnectVbd(previousVBD)
+    await previousVBD.$unplug()
     await xapi.VDI_destroy(previousVBD.VDI)
     CURRENT_POOL_OPERATIONS[poolId] = { ...OPERATION_OBJECT, state: 4 }
     await xapi.callAsync('SR.scan', xapi.getObject(xosansr).$ref)

diff --git a/packages/xo-server/src/xapi/index.mjs b/packages/xo-server/src/xapi/index.mjs
@@ -1075,23 +1075,6 @@ export default class Xapi extends XapiBase {
     await this.callAsync('VBD.plug', vbdId)
   }
 
-  async _disconnectVbd(vbd) {
-    // TODO: check if VBD is attached before
-    try {
-      await this.call('VBD.unplug_force', vbd.$ref)
-    } catch (error) {
-      if (error.code === 'VBD_NOT_UNPLUGGABLE') {
-        await vbd.set_unpluggable(true)
-        return this.call('VBD.unplug_force', vbd.$ref)
-      }
-      throw error
-    }
-  }
-
-  async disconnectVbd(vbdId) {
-    await this._disconnectVbd(this.getObject(vbdId))
-  }
-
   // TODO: remove when no longer used.
   async destroyVbdsFromVm(vmId) {
     await Promise.all(this.getObject(vmId).VBDs.map(async ref => this.VBD_destroy(ref)))