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

packages/xo-server/src/api/disk.mjs

@@ -129,20 +129,19 @@ exportContent.resolve = {
 
 // -------------------------------------------------------------------
 
-async function handleImportContent(req, res, { xapi, id }) {
+async function handleImportContent(req, res, { vdi }) {
   // Timeout seems to be broken in Node 4.
   // See https://github.com/nodejs/node/issues/3319
   req.setTimeout(43200000) // 12 hours
   req.length = +req.headers['content-length']
-  await xapi.importVdiContent(id, req)
+  await vdi.$importContent(req, { format: VDI_FORMAT_VHD })
   res.end(format.response(0, true))
 }
 
 export async function importContent({ vdi }) {
   return {
     $sendTo: await this.registerHttpRequest(handleImportContent, {
-      id: vdi._xapiId,
-      xapi: this.getXapi(vdi),
+      vdi: this.getXapiObject(vdi),
     }),
   }
 }
@@ -223,7 +222,7 @@ async function handleImport(req, res, { type, name, description, vmdkData, srId,
             })
           )
           try {
-            await xapi.importVdiContent(vdi, vhdStream, { format: diskFormat })
+            await vdi.$importContent(vhdStream, { format: diskFormat })
             res.end(format.response(0, vdi.$id))
           } catch (e) {
             await vdi.$destroy()

packages/xo-server/src/xapi/index.mjs

@@ -45,7 +45,6 @@ import {
   parseDateTime,
   prepareXapiParam,
 } from './utils.mjs'
-import { createVhdStreamWithLength } from 'vhd-lib'
 
 const log = createLogger('xo:xapi')
 
@@ -887,7 +886,7 @@ export default class Xapi extends XapiBase {
           compression[entry.name] === 'gzip'
         )
         try {
-          await this._importVdiContent(vdi, vhdStream, VDI_FORMAT_VHD)
+          await vdi.$importContent(vhdStream, { format: VDI_FORMAT_VHD })
           // See: https://github.com/mafintosh/tar-stream#extracting
           // No import parallelization.
         } catch (e) {
@@ -1309,41 +1308,6 @@ export default class Xapi extends XapiBase {
     return this._exportVdi($cancelToken, this.getObject(vdi), undefined, format)
   }
 
-  // -----------------------------------------------------------------
-
-  async _importVdiContent(vdi, body, format = VDI_FORMAT_VHD) {
-    if (typeof body.pipe === 'function' && body.length === undefined) {
-      if (this._guessVhdSizeOnImport && format === VDI_FORMAT_VHD) {
-        body = await createVhdStreamWithLength(body)
-      } else if (__DEV__) {
-        throw new Error('Trying to import a VDI without a length field. Please report this error to Xen Orchestra.')
-      }
-    }
-
-    await Promise.all([
-      body.task,
-      body.checksumVerified,
-      this.putResource(body, '/import_raw_vdi/', {
-        query: {
-          format,
-          vdi: vdi.$ref,
-        },
-        task: this.task_create('VDI Content Import', vdi.name_label),
-      }),
-    ]).catch(error => {
-      // augment the error with as much relevant info as possible
-      error.pool_master = vdi.$pool.$master
-      error.SR = vdi.$SR
-      error.VDI = vdi
-
-      throw error
-    })
-  }
-
-  importVdiContent(vdiId, body, { format } = {}) {
-    return this._importVdiContent(this.getObject(vdiId), body, format)
-  }
-
   // =================================================================
 
   @decorateWith(deferrable)
@@ -1547,7 +1511,7 @@ export default class Xapi extends XapiBase {
 
     // ignore errors, I (JFT) don't understand why they are emitted
     // because it works
-    await this._importVdiContent(vdi, buffer, VDI_FORMAT_RAW).catch(error => {
+    await vdi.$importContent(buffer, { format: VDI_FORMAT_RAW }).catch(error => {
       log.warn('importVdiContent: ', { error })
     })
 
@@ -1566,7 +1530,7 @@ export default class Xapi extends XapiBase {
     )
     $defer.onFailure(() => vdi.$destroy())
 
-    await this.importVdiContent(vdi.$id, stream, { format: VDI_FORMAT_RAW })
+    await vdi.$importContent(stream, { format: VDI_FORMAT_RAW })
 
     return vdi
   }