fix(xo-web/SR): destination SRs are ISOs if we are migrating ISOs (#7431

) Fixes #7392
vatesfr · Mar 6, 2024 · e52a0bd · e52a0bd
1 parent 48e6d58
commit e52a0bd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -11,6 +11,8 @@
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
+- [ISO SR] During ISO migration, the destination SRs were not ISO SRs [#7392](https://github.com/vatesfr/xen-orchestra/issues/7392) (PR [#7431](https://github.com/vatesfr/xen-orchestra/pull/7431))
+
 ### Packages to release
 
 > When modifying a package, add it here with its release type.
@@ -28,5 +30,6 @@
 <!--packages-start-->
 
 - xo-server patch
+- xo-web patch
 
 <!--packages-end-->
diff --git a/packages/xo-web/src/common/xo/index.js b/packages/xo-web/src/common/xo/index.js
@@ -74,6 +74,7 @@ export const XEN_VIDEORAM_VALUES = [1, 2, 4, 8, 16]
 
 // ===================================================================
 
+export const isSrIso = sr => sr && sr.content_type === 'iso' && sr.size > 0
 export const isSrWritable = sr => sr && sr.content_type !== 'iso' && sr.size > 0
 export const isSrWritableOrIso = sr => sr && sr.size > 0
 export const isSrShared = sr => sr && sr.shared

diff --git a/packages/xo-web/src/common/xo/migrate-vdi-modal/index.js b/packages/xo-web/src/common/xo/migrate-vdi-modal/index.js
@@ -8,7 +8,7 @@ import { createCompare, createCompareContainers } from 'utils'
 import { createSelector } from 'selectors'
 import { SelectResourceSetsSr, SelectSr as SelectAnySr } from 'select-objects'
 
-import { isSrShared, isSrWritable } from '../'
+import { isSrIso, isSrShared, isSrWritable } from '../'
 
 const compareSrs = createCompare([isSrShared])
 
@@ -33,7 +33,8 @@ export default class MigrateVdiModalBody extends Component {
 
   _getSrPredicate = createSelector(
     () => this.props.pool,
-    pool => sr => isSrWritable(sr) && sr.$pool === pool
+    () => this.props.isoSr,
+    (pool, isoSr) => sr => (isoSr ? isSrIso(sr) : isSrWritable(sr)) && sr.$pool === pool
   )
 
   render() {

diff --git a/packages/xo-web/src/xo-app/sr/tab-disks.js b/packages/xo-web/src/xo-app/sr/tab-disks.js
@@ -32,6 +32,7 @@ import {
   exportVdi,
   importVdi,
   isVmRunning,
+  isSrIso,
   isSrShared,
   migrateVdi,
 } from 'xo'
@@ -361,6 +362,7 @@ export default class SrDisks extends Component {
         <MigrateVdiModalBody
           pool={this.props.sr.$pool}
           warningBeforeMigrate={this._getGenerateWarningBeforeMigrate(vdis)}
+          isoSr={isSrIso(this.props.sr)}
         />
       ),
     }).then(({ sr }) => {