Skip to content

Commit

Permalink
feat(xo-server): set new XAPI platform flag for nested virtualization
Browse files Browse the repository at this point in the history
  • Loading branch information
MelissaFrncJrg committed Mar 3, 2025
1 parent 39613ff commit 40d4b6c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
5 changes: 4 additions & 1 deletion packages/xo-server/src/xapi-object-to-xo.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Obfuscate from '@vates/obfuscate'
import * as xoData from '@xen-orchestra/xapi/xoData.mjs'
import ensureArray from './_ensureArray.mjs'
import normalizeVmNetworks from './_normalizeVmNetworks.mjs'
import semver from 'semver'
import { createLogger } from '@xen-orchestra/log'
import { extractIpFromVmNetworks } from './_extractIpFromVmNetworks.mjs'
import { extractProperty, forEach, isEmpty, mapFilter, parseXml } from './utils.mjs'
Expand Down Expand Up @@ -398,7 +399,9 @@ const TRANSFORMS = {
version: version && parseXml(version).docker_version,
}
})(),
expNestedHvm: obj.platform['exp-nested-hvm'] === 'true',
expNestedHvm: semver.satisfies(obj.hardware_platform_version, '>=3.4')
? obj.platform['nested-virt'] === 'true'
: obj.platform['exp-nested-hvm'] === true,
viridian: obj.platform.viridian === 'true',
mainIpAddress: extractIpFromVmNetworks(guestMetrics?.networks),
high_availability: obj.ha_restart_priority,
Expand Down
8 changes: 7 additions & 1 deletion packages/xo-server/src/xapi/mixins/vm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ 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'
Expand Down Expand Up @@ -491,7 +492,12 @@ const methods = {
hasVendorDevice: true,

expNestedHvm: {
set: (expNestedHvm, vm) => vm.update_platform('exp-nested-hvm', expNestedHvm ? 'true' : null),
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)
},
},

nicType: {
Expand Down

0 comments on commit 40d4b6c

Please sign in to comment.