changes after review

Author: MelissaFrncJrg

@vates/types/src/xo.mts

@@ -44,7 +44,9 @@ type BaseXoVm = {
     process?: string
     version?: string
   }
+  // deprecated, use nestedVirt instead
   expNestedHvm: boolean
+  nestedVirt: boolean
   hasVendorDevice: boolean
   high_availability: string
   installTime?: number | null

packages/xo-server/src/api/vm.mjs

@@ -750,6 +750,8 @@ set.params = {
 
   expNestedHvm: { type: 'boolean', optional: true },
 
+  nestedVirt: { type: 'boolean', optional: true },
+
   // Move the vm In to/Out of Self Service
   resourceSet: { type: ['string', 'null'], optional: true },
 

packages/xo-server/src/xapi-object-to-xo.mjs

@@ -399,9 +399,12 @@ const TRANSFORMS = {
           version: version && parseXml(version).docker_version,
         }
       })(),
-      expNestedHvm: semver.satisfies(obj.hardware_platform_version, '>=3.4')
+      // deprecated, use nestedVirt instead
+      expNestedHvm: obj.platform['exp-nested-hvm'] === 'true',
+      nestedVirt: obj.platform['nested-virt'] === 'true',
+      isNestedVirtEnable: semver.satisfies(obj.hardware_platform_version, '>=3.4')
         ? obj.platform['nested-virt'] === 'true'
-        : obj.platform['exp-nested-hvm'] === true,
+        : obj.platform['exp-nested-hvm'] === 'true',
       viridian: obj.platform.viridian === 'true',
       mainIpAddress: extractIpFromVmNetworks(guestMetrics?.networks),
       high_availability: obj.ha_restart_priority,

packages/xo-server/src/xapi/mixins/vm.mjs

@@ -8,7 +8,6 @@ import lte from 'lodash/lte.js'
 import forEach from 'lodash/forEach.js'
 import mapValues from 'lodash/mapValues.js'
 import noop from 'lodash/noop.js'
-import semver from 'semver'
 import { asyncMap } from '@xen-orchestra/async-map'
 import { createLogger } from '@xen-orchestra/log'
 import { decorateObject } from '@vates/decorate-with'
@@ -491,13 +490,13 @@ const methods = {
 
     hasVendorDevice: true,
 
+    // deprecated, property kept for backward compatibility, for XCP 8.3+ use nestedVirt instead
     expNestedHvm: {
-      set: (expNestedHvm, vm) => {
-        const platformVersion = semver.satisfies(vm.hardware_platform_version, '>=3.4')
-          ? 'nested-virt'
-          : 'exp-nested-hvm'
-        vm.update_platform(platformVersion, expNestedHvm ? 'true' : null)
-      },
+      set: (expNestedHvm, vm) => vm.update_platform('exp-nested-hvm', expNestedHvm ? 'true' : null),
+    },
+
+    nestedVirt: {
+      set: (nestedVirt, vm) => vm.update_platform('nested-virt', nestedVirt ? 'true' : null),
     },
 
     nicType: {

packages/xo-web/src/xo-app/vm/tab-advanced.js

@@ -1105,8 +1105,14 @@ export default class TabAdvanced extends Component {
                     <td>
                       <Toggle
                         disabled={vm.power_state !== 'Halted'}
-                        value={vm.expNestedHvm}
-                        onChange={value => editVm(vm, { expNestedHvm: value })}
+                        value={vm.isNestedVirtEnabled}
+                        onChange={value => {
+                          if (semver.satisfies(vm.platform_version, '>=3.4')) {
+                            editVm(vm, { nestedVirt: value })
+                          } else {
+                            editVm(vm, { expectedHvm: value })
+                          }
+                        }}
                       />
                     </td>
                   </tr>