fix(xo-server/backupNg.importVmBackup): add missing version for delta

This commit is contained in:
Julien Fontanet 2018-03-16 17:14:38 +01:00
parent 80187e2789
commit ad0d4156fb
2 changed files with 24 additions and 20 deletions

View File

@ -10,19 +10,22 @@ type AugmentedReadable = Readable & {
type MaybeArray<T> = Array<T> | T
export type DeltaVmExport = {|
streams: $Dict<() => Promise<AugmentedReadable>>,
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<MaybeArray<AugmentedReadable | () => Promise<AugmentedReadable>>>,
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<void>;
editVm(vm: Id, $Dict<mixed>): Promise<void>;
exportDeltaVm(
cancelToken: mixed,
snapshot: Id,
baseSnapshot?: Id
): Promise<DeltaVmExport>;
exportVm(
cancelToken: mixed,
vm: Vm,
options?: Object
): Promise<AugmentedReadable>;
getObject(object: Id): XapiObject;
importDeltaVm(data: DeltaVmImport, options: Object): Promise<{ vm: Vm }>;
importVm(stream: AugmentedReadable, options: Object): Promise<Vm>;
exportDeltaVm(
cancelToken: mixed,
snapshot: Id,
baseSnapshot ?: Id
): Promise<DeltaVmExport>;
exportVm(
cancelToken: mixed,
vm: Vm,
options ?: Object
): Promise<AugmentedReadable>;
getObject(object: Id): XapiObject;
importDeltaVm(data: DeltaVmImport, options: Object): Promise<{ vm: Vm }>;
importVm(stream: AugmentedReadable, options: Object): Promise<Vm>;
}

View File

@ -202,6 +202,7 @@ const importers: $Dict<
streams,
vbds: metadata.vbds,
vdis,
version: '1.0.0',
vifs: metadata.vifs,
vm: {
...vm,