NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
packages/xo-server/src/xapi/index.js.flow
View File

@ -10,19 +10,22 @@ type AugmentedReadable = Readable & {
type MaybeArray<T> = Array<T> | T type MaybeArray<T> = Array<T> | T
export type DeltaVmExport = {| export type DeltaVmExport = {|
streams: $Dict<() => Promise<AugmentedReadable>>, streams: $Dict < () => Promise < AugmentedReadable >>,
vbds: { [ref: string]: Object }, vbds: { [ref: string]: Object },
vdis: { [ref: string]: { vdis: {
[ref: string]: {
$SR$uuid: string, $SR$uuid: string,
snapshot_of: string, snapshot_of: string,
} }, }
},
version: '1.0.0',
vifs: { [ref: string]: Object }, vifs: { [ref: string]: Object },
vm: Vm, vm: Vm,
|} |}
export type DeltaVmImport = {| export type DeltaVmImport = {|
...DeltaVmExport, ...DeltaVmExport,
streams: $Dict<MaybeArray<AugmentedReadable | () => Promise<AugmentedReadable>>>, streams: $Dict < MaybeArray < AugmentedReadable | () => Promise < AugmentedReadable >>>,
|} |}
declare class XapiObject { declare class XapiObject {
@ -65,17 +68,17 @@ declare export class Xapi {
barrier(ref: string): XapiObject; barrier(ref: string): XapiObject;
deleteVm(vm: Id): Promise<void>; deleteVm(vm: Id): Promise<void>;
editVm(vm: Id, $Dict<mixed>): Promise<void>; editVm(vm: Id, $Dict<mixed>): Promise<void>;
exportDeltaVm( exportDeltaVm(
cancelToken: mixed, cancelToken: mixed,
snapshot: Id, snapshot: Id,
baseSnapshot?: Id baseSnapshot ?: Id
): Promise<DeltaVmExport>; ): Promise<DeltaVmExport>;
exportVm( exportVm(
cancelToken: mixed, cancelToken: mixed,
vm: Vm, vm: Vm,
options?: Object options ?: Object
): Promise<AugmentedReadable>; ): Promise<AugmentedReadable>;
getObject(object: Id): XapiObject; getObject(object: Id): XapiObject;
importDeltaVm(data: DeltaVmImport, options: Object): Promise<{ vm: Vm }>; importDeltaVm(data: DeltaVmImport, options: Object): Promise<{ vm: Vm }>;
importVm(stream: AugmentedReadable, options: Object): Promise<Vm>; importVm(stream: AugmentedReadable, options: Object): Promise<Vm>;
} }

1
packages/xo-server/src/xo-mixins/backups-ng/index.js
View File

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