Skip to content

Commit 33e8f7c

Browse files
authored
Merge branch 'master' into pierre-reconfigure-management-pif
2 parents 5d64d50 + 58c2c51 commit 33e8f7c

File tree

57 files changed

+497
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+497
-216
lines changed

@vates/fuse-vhd/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"main": "./index.mjs",
2121
"dependencies": {
22-
"@xen-orchestra/fs": "^4.6.6",
22+
"@xen-orchestra/fs": "^4.6.7",
2323
"@xen-orchestra/log": "^0.7.1",
2424
"fuse-native": "^2.2.6",
2525
"lru-cache": "^7.14.0",

@vates/types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vates/types",
33
"private": false,
4-
"version": "1.19.0",
4+
"version": "1.20.0",
55
"main": "./dist/index.mjs",
66
"exports": {
77
".": {

@vates/types/src/lib/xen-orchestra-xapi.mts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ import {
1313
XenApiVmWrapped,
1414
XenApiVtpm,
1515
} from '../xen-api.mjs'
16-
import type { OPAQUE_REF_NULL, SUPPORTED_VDI_FORMAT, VBD_MODE, VBD_TYPE, VIF_LOCKING_MODE } from '../common.mjs'
16+
import type {
17+
OPAQUE_REF_NULL,
18+
SUPPORTED_VDI_FORMAT,
19+
VBD_MODE,
20+
VBD_TYPE,
21+
VDI_TYPE,
22+
VIF_LOCKING_MODE,
23+
} from '../common.mjs'
1724
import type { PassThrough, Readable } from 'node:stream'
1825
import type {
1926
XoGpuGroup,
@@ -121,6 +128,7 @@ export interface Xapi {
121128
xenstore_data?: Record<string, string>
122129
}
123130
): Promise<XenApiVdi['$ref']>
131+
SR_reclaimSpace(ref: XenApiSr['$ref']): Promise<void>
124132
startVm(
125133
id: XoVm['id'],
126134
opts?: {
@@ -218,6 +226,23 @@ export interface Xapi {
218226
}): Promise<XenApiVbd['$ref']>
219227
VBD_destroy(vbdRef: XenApiVbd['$ref']): Promise<void>
220228
VBD_unplug(vbdRef: XenApiVbd['$ref']): Promise<void>
229+
VDI_create(
230+
options: {
231+
name_description?: XoVdi['name_description']
232+
name_label?: XoVdi['name_label']
233+
other_config?: XoVdi['other_config']
234+
read_only?: boolean
235+
sharable?: boolean
236+
SR?: XenApiSr['$ref']
237+
tags?: XoVdi['tags']
238+
type?: VDI_TYPE
239+
virtual_size: XoVdi['size']
240+
xenstore_data?: Record<string, string>
241+
},
242+
extraOptions?: {
243+
sm_config?: Record<string, string>
244+
}
245+
): Promise<XenApiVdi['$ref']>
221246
VDI_destroy(vdiRef: XenApiVdi['$ref']): Promise<void>
222247
VDI_destroyCloudInitConfig(vdiRef: XenApiVdi['$ref'], opts?: { timeLimit?: number }): Promise<void>
223248
VDI_exportContent(

@xen-orchestra/backups-cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"dependencies": {
99
"@vates/async-each": "^1.0.1",
1010
"@xen-orchestra/async-map": "^0.1.2",
11-
"@xen-orchestra/backups": "^0.68.2",
12-
"@xen-orchestra/fs": "^4.6.6",
11+
"@xen-orchestra/backups": "^0.69.0",
12+
"@xen-orchestra/fs": "^4.6.7",
1313
"filenamify": "^6.0.0",
1414
"getopts": "^2.2.5",
1515
"lodash": "^4.17.15",
@@ -28,7 +28,7 @@
2828
"scripts": {
2929
"postversion": "npm publish --access public"
3030
},
31-
"version": "1.1.7",
31+
"version": "1.1.8",
3232
"license": "AGPL-3.0-or-later",
3333
"author": {
3434
"name": "Vates SAS",

@xen-orchestra/backups/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"type": "git",
99
"url": "https://github.com/vatesfr/xen-orchestra.git"
1010
},
11-
"version": "0.68.2",
11+
"version": "0.69.0",
1212
"engines": {
1313
"node": ">=14.18"
1414
},
@@ -30,7 +30,7 @@
3030
"@vates/parse-duration": "^0.1.1",
3131
"@xen-orchestra/async-map": "^0.1.2",
3232
"@xen-orchestra/disk-transform": "^1.2.1",
33-
"@xen-orchestra/fs": "^4.6.6",
33+
"@xen-orchestra/fs": "^4.6.7",
3434
"@xen-orchestra/log": "^0.7.1",
3535
"@xen-orchestra/qcow2": "^1.1.2",
3636
"@xen-orchestra/template": "^0.1.0",

@xen-orchestra/fs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": false,
33
"name": "@xen-orchestra/fs",
4-
"version": "4.6.6",
4+
"version": "4.6.7",
55
"license": "AGPL-3.0-or-later",
66
"description": "The File System for Xen Orchestra backups.",
77
"homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/fs",

@xen-orchestra/immutable-backups/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"xo-lift-remote-immutability": "./liftProtection.mjs"
1818
},
1919
"license": "AGPL-3.0-or-later",
20-
"version": "1.0.29",
20+
"version": "1.0.30",
2121
"engines": {
2222
"node": ">=14.0.0"
2323
},
2424
"dependencies": {
2525
"@vates/async-each": "^1.0.1",
26-
"@xen-orchestra/backups": "^0.68.2",
26+
"@xen-orchestra/backups": "^0.69.0",
2727
"@xen-orchestra/log": "^0.7.1",
2828
"app-conf": "^3.0.0",
2929
"chokidar": "^3.6.0",

@xen-orchestra/lite/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
"@types/file-saver": "^2.0.7",
2929
"@types/lodash-es": "^4.17.12",
3030
"@types/node": "^18.19.80",
31-
"@vates/types": "^1.19.0",
31+
"@vates/types": "^1.20.0",
3232
"@vitejs/plugin-vue": "^5.2.1",
3333
"@vue/tsconfig": "^0.7.0",
3434
"@vueuse/core": "^13.0.0",
3535
"@vueuse/math": "^13.0.0",
3636
"@vueuse/shared": "^13.0.0",
37-
"@xen-orchestra/web-core": "^0.42.0",
37+
"@xen-orchestra/web-core": "^0.43.0",
3838
"complex-matcher": "^1.0.0",
3939
"d3-time-format": "^4.1.0",
4040
"decorator-synchronized": "^0.6.0",
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<template>
2+
<ComponentStory
3+
v-slot="{ properties, settings }"
4+
:params="[
5+
prop('accent').enum('brand', 'warning', 'danger').widget(),
6+
slot().help('Meant to receive message of the banner'),
7+
slot('addons').help('Meant to receive addons like button etc.'),
8+
setting('defaultSlot').widget(text()).preset('Message of the banner'),
9+
]"
10+
>
11+
<VtsBanner v-bind="properties">{{ settings.defaultSlot }}</VtsBanner>
12+
</ComponentStory>
13+
</template>
14+
15+
<script setup lang="ts">
16+
import ComponentStory from '@/components/component-story/ComponentStory.vue'
17+
import { prop, setting, slot } from '@/libs/story/story-param.ts'
18+
import { text } from '@/libs/story/story-widget.ts'
19+
import VtsBanner from '@core/components/banner/VtsBanner.vue'
20+
</script>

@xen-orchestra/lite/typed-router.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ declare module 'vue-router/auto-routes' {
4949
'/story/story-example': RouteRecordInfo<'/story/story-example', '/story/story-example', Record<never, never>, Record<never, never>>,
5050
'/story/ui-badge': RouteRecordInfo<'/story/ui-badge', '/story/ui-badge', Record<never, never>, Record<never, never>>,
5151
'/story/ui-filter': RouteRecordInfo<'/story/ui-filter', '/story/ui-filter', Record<never, never>, Record<never, never>>,
52+
'/story/web-core/banner/vts-banner': RouteRecordInfo<'/story/web-core/banner/vts-banner', '/story/web-core/banner/vts-banner', Record<never, never>, Record<never, never>>,
5253
'/story/web-core/button-group/vts-button-group': RouteRecordInfo<'/story/web-core/button-group/vts-button-group', '/story/web-core/button-group/vts-button-group', Record<never, never>, Record<never, never>>,
5354
'/story/web-core/card/vts-card-row-key-value': RouteRecordInfo<'/story/web-core/card/vts-card-row-key-value', '/story/web-core/card/vts-card-row-key-value', Record<never, never>, Record<never, never>>,
5455
'/story/web-core/cell-object/vts-cell-object': RouteRecordInfo<'/story/web-core/cell-object/vts-cell-object', '/story/web-core/cell-object/vts-cell-object', Record<never, never>, Record<never, never>>,

0 commit comments

Comments
 (0)