Merge branch 'master' into rest-tags

vatesfr · Nov 23, 2023 · 2373e5e · 2373e5e
2 parents 9c6ffd5 + 8abfaa0
commit 2373e5e
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 39 deletions.
diff --git a/@xen-orchestra/lite/CHANGELOG.md b/@xen-orchestra/lite/CHANGELOG.md
@@ -6,6 +6,7 @@
 - More compact UI (PR [#7159](https://github.com/vatesfr/xen-orchestra/pull/7159))
 - Fix dashboard host patches list (PR [#7169](https://github.com/vatesfr/xen-orchestra/pull/7169))
 - Ability to export selected VMs (PR [#7174](https://github.com/vatesfr/xen-orchestra/pull/7174))
+- [VM/Action] Ability to export a VM from its view (PR [#7190](https://github.com/vatesfr/xen-orchestra/pull/7190))
 
 ## **0.1.5** (2023-11-07)
 

diff --git a/@xen-orchestra/lite/src/components/vm/VmActionItems/VmActionExportItem.vue b/@xen-orchestra/lite/src/components/vm/VmActionItems/VmActionExportItem.vue
@@ -3,13 +3,13 @@
     v-tooltip="
       vmRefs.length > 0 &&
       !isSomeExportable &&
-      $t('no-selected-vm-can-be-exported')
+      $t(isSingleAction ? 'vm-is-running' : 'no-selected-vm-can-be-exported')
     "
     :icon="faDisplay"
     :disabled="isDisabled"
     @click="openModal"
   >
-    {{ $t("export-vms") }}
+    {{ $t(isSingleAction ? "export-vm" : "export-vms") }}
   </MenuItem>
 </template>
 <script lang="ts" setup>
@@ -26,7 +26,10 @@ import { vTooltip } from "@/directives/tooltip.directive";
 
 import type { XenApiVm } from "@/libs/xen-api/xen-api.types";
 
-const props = defineProps<{ vmRefs: XenApiVm["$ref"][] }>();
+const props = defineProps<{
+  vmRefs: XenApiVm["$ref"][];
+  isSingleAction?: boolean;
+}>();
 
 const { getByOpaqueRefs, areSomeOperationAllowed } = useVmCollection();
 

diff --git a/@xen-orchestra/lite/src/components/vm/VmHeader.vue b/@xen-orchestra/lite/src/components/vm/VmHeader.vue
@@ -26,6 +26,7 @@
           />
         </template>
         <VmActionCopyItem :selected-refs="[vm.$ref]" is-single-action />
+        <VmActionExportItem :vm-refs="[vm.$ref]" is-single-action />
         <VmActionSnapshotItem :vm-refs="[vm.$ref]" />
       </AppMenu>
     </template>
@@ -40,6 +41,7 @@ import UiButton from "@/components/ui/UiButton.vue";
 import VmActionPowerStateItems from "@/components/vm/VmActionItems/VmActionPowerStateItems.vue";
 import VmActionSnapshotItem from "@/components/vm/VmActionItems/VmActionSnapshotItem.vue";
 import VmActionCopyItem from "@/components/vm/VmActionItems/VmActionCopyItem.vue";
+import VmActionExportItem from "@/components/vm/VmActionItems/VmActionExportItem.vue";
 import { useVmCollection } from "@/stores/xen-api/vm.store";
 import { vTooltip } from "@/directives/tooltip.directive";
 import type { XenApiVm } from "@/libs/xen-api/xen-api.types";

diff --git a/@xen-orchestra/lite/src/locales/en.json b/@xen-orchestra/lite/src/locales/en.json
@@ -55,6 +55,7 @@
   "export-n-vms": "Export 1 VM | Export {n} VMs",
   "export-n-vms-manually": "Export 1 VM manually | Export {n} VMs manually",
   "export-table-to": "Export table to {type}",
+  "export-vm": "Export VM",
   "export-vms": "Export VMs",
   "export-vms-manually-information": "Some VM exports were not able to start automatically, probably due to your browser settings. To export them, you should click on each one. (Alternatively, copy the link as well.)",
   "fetching-fresh-data": "Fetching fresh data",

diff --git a/@xen-orchestra/lite/src/locales/fr.json b/@xen-orchestra/lite/src/locales/fr.json
@@ -55,6 +55,7 @@
   "export-n-vms": "Exporter 1 VM | Exporter {n} VMs",
   "export-n-vms-manually": "Exporter 1 VM manuellement | Exporter {n} VMs manuellement",
   "export-table-to": "Exporter le tableau en {type}",
+  "export-vm": "Exporter la VM",
   "export-vms": "Exporter les VMs",
   "export-vms-manually-information": "Certaines exportations de VMs n'ont pas pu démarrer automatiquement, peut-être en raison des paramètres du navigateur. Pour les exporter, vous devrez cliquer sur chacune d'entre elles. (Ou copier le lien.)",
   "fetching-fresh-data": "Récupération de données à jour",

diff --git a/@xen-orchestra/xapi/vdi.mjs b/@xen-orchestra/xapi/vdi.mjs
@@ -140,7 +140,7 @@ class Vdi {
     try {
       const taskRef = await this.task_create(`Importing content into VDI ${vdi.name_label} on SR ${sr.name_label}`)
       const uuid = await this.getField('task', taskRef, 'uuid')
-      await vdi.update_other_config({ 'xo:import:task': uuid, 'xo:import:length': stream.length })
+      await vdi.update_other_config({ 'xo:import:task': uuid, 'xo:import:length': stream.length.toString() })
       await this.putResource(cancelToken, stream, '/import_raw_vdi/', {
         query: {
           format,

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -11,6 +11,7 @@
 - [VM/Console] Add a message to indicate that the console view has been [disabled](https://support.citrix.com/article/CTX217766/how-to-disable-the-console-for-the-vm-in-xencenter) for this VM [#6319](https://github.com/vatesfr/xen-orchestra/issues/6319) (PR [#7161](https://github.com/vatesfr/xen-orchestra/pull/7161))
 - [Restore] Show source remote and restoration time on a restored VM (PR [#7186](https://github.com/vatesfr/xen-orchestra/pull/7186))
 - [Backup/Import] Show disk import status during Incremental Replication or restoration of Incremental Backup (PR [#7171](https://github.com/vatesfr/xen-orchestra/pull/7171))
+- [VM Creation] Added ISO option in new VM form when creating from template with a disk [#3464](https://github.com/vatesfr/xen-orchestra/issues/3464) (PR [#7166](https://github.com/vatesfr/xen-orchestra/pull/7166))
 - [REST API] `tags` property can be updated (PR [#7196](https://github.com/vatesfr/xen-orchestra/pull/7196))
 
 ### Bug fixes

diff --git a/docs/installation.md b/docs/installation.md
@@ -112,7 +112,7 @@ apt-get install build-essential redis-server libpng-dev git python3-minimal libv
 On Fedora/CentOS like:
 
 ```sh
-dnf install redis libpng-devel git libvhdi-utils lvm2 cifs-utils make automake gcc gcc-c++
+dnf install redis libpng-devel git libvhdi-tools lvm2 cifs-utils make automake gcc gcc-c++
 ```
 
 ### Make sure Redis is running

diff --git a/packages/xo-web/src/xo-app/new-vm/index.js b/packages/xo-web/src/xo-app/new-vm/index.js
@@ -1223,40 +1223,6 @@ export default class NewVm extends BaseComponent {
           </SectionContent>
         ) : (
           <SectionContent>
-            <Item>
-              <span className={styles.item}>
-                <input
-                  checked={installMethod === 'ISO'}
-                  name='installMethod'
-                  onChange={this._linkState('installMethod')}
-                  type='radio'
-                  value='ISO'
-                />
-                &nbsp;
-                <span>{_('newVmIsoDvdLabel')}</span>
-                &nbsp;
-                <span className={styles.inlineSelect}>
-                  {this.props.pool ? (
-                    <SelectVdi
-                      disabled={installMethod !== 'ISO'}
-                      onChange={this._linkState('installIso')}
-                      predicate={isVdiPresent}
-                      srPredicate={this._getIsoPredicate()}
-                      value={installIso}
-                    />
-                  ) : (
-                    <SelectResourceSetsVdi
-                      disabled={installMethod !== 'ISO'}
-                      onChange={this._linkState('installIso')}
-                      predicate={isVdiPresent}
-                      resourceSet={this._getResolvedResourceSet()}
-                      srPredicate={this._getIsoPredicate()}
-                      value={installIso}
-                    />
-                  )}
-                </span>
-              </span>
-            </Item>
             {template.virtualizationMode === 'pv' ? (
               <span>
                 <Item>
@@ -1295,6 +1261,40 @@ export default class NewVm extends BaseComponent {
             )}
           </SectionContent>
         )}
+        <SectionContent>
+          <span className={styles.item}>
+            <input
+              checked={installMethod === 'ISO'}
+              name='installMethod'
+              onChange={this._linkState('installMethod')}
+              type='radio'
+              value='ISO'
+            />
+            &nbsp;
+            <span>{_('newVmIsoDvdLabel')}</span>
+            &nbsp;
+            <span className={styles.inlineSelect}>
+              {this.props.pool ? (
+                <SelectVdi
+                  disabled={installMethod !== 'ISO'}
+                  onChange={this._linkState('installIso')}
+                  predicate={isVdiPresent}
+                  srPredicate={this._getIsoPredicate()}
+                  value={installIso}
+                />
+              ) : (
+                <SelectResourceSetsVdi
+                  disabled={installMethod !== 'ISO'}
+                  onChange={this._linkState('installIso')}
+                  predicate={isVdiPresent}
+                  resourceSet={this._getResolvedResourceSet()}
+                  srPredicate={this._getIsoPredicate()}
+                  value={installIso}
+                />
+              )}
+            </span>
+          </span>
+        </SectionContent>
         {this._isCoreOs() && (
           <div>
             <label>{_('newVmCloudConfig')}</label>{' '}