diff --git a/packages/xo-server/src/xapi/index.js.flow b/packages/xo-server/src/xapi/index.js.flow index 81e3a9714..c660c6949 100644 --- a/packages/xo-server/src/xapi/index.js.flow +++ b/packages/xo-server/src/xapi/index.js.flow @@ -10,19 +10,22 @@ type AugmentedReadable = Readable & { type MaybeArray = Array | T export type DeltaVmExport = {| - streams: $Dict<() => Promise>, - vbds: { [ref: string]: Object }, - vdis: { [ref: string]: { + streams: $Dict < () => Promise < AugmentedReadable >>, + vbds: { [ref: string]: Object }, +vdis: { + [ref: string]: { $SR$uuid: string, - snapshot_of: string, - } }, + snapshot_of: string, + } +}, +version: '1.0.0', vifs: { [ref: string]: Object }, - vm: Vm, +vm: Vm, |} export type DeltaVmImport = {| ...DeltaVmExport, - streams: $Dict Promise>>, +streams: $Dict < MaybeArray < AugmentedReadable | () => Promise < AugmentedReadable >>>, |} declare class XapiObject { @@ -65,17 +68,17 @@ declare export class Xapi { barrier(ref: string): XapiObject; deleteVm(vm: Id): Promise; editVm(vm: Id, $Dict): Promise; - exportDeltaVm( - cancelToken: mixed, - snapshot: Id, - baseSnapshot?: Id - ): Promise; - exportVm( - cancelToken: mixed, - vm: Vm, - options?: Object - ): Promise; - getObject(object: Id): XapiObject; - importDeltaVm(data: DeltaVmImport, options: Object): Promise<{ vm: Vm }>; - importVm(stream: AugmentedReadable, options: Object): Promise; +exportDeltaVm( + cancelToken: mixed, + snapshot: Id, + baseSnapshot ?: Id +): Promise; +exportVm( + cancelToken: mixed, + vm: Vm, + options ?: Object +): Promise; +getObject(object: Id): XapiObject; +importDeltaVm(data: DeltaVmImport, options: Object): Promise<{ vm: Vm }>; +importVm(stream: AugmentedReadable, options: Object): Promise; } diff --git a/packages/xo-server/src/xo-mixins/backups-ng/index.js b/packages/xo-server/src/xo-mixins/backups-ng/index.js index 4ad749473..291bba888 100644 --- a/packages/xo-server/src/xo-mixins/backups-ng/index.js +++ b/packages/xo-server/src/xo-mixins/backups-ng/index.js @@ -202,6 +202,7 @@ const importers: $Dict< streams, vbds: metadata.vbds, vdis, + version: '1.0.0', vifs: metadata.vifs, vm: { ...vm,