Skip to content

Commit

Permalink
changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
MathieuRA committed Nov 18, 2024
1 parent 1417dd6 commit 431f639
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- Ignore leading and trailing spaces when editing VM/Pools/Hosts/SRs names and descriptions (PR [#8115](https://github.com/vatesfr/xen-orchestra/pull/8115))
- [VM/Advanced] in Nested virtualization section, add warning tooltip and link to documentation (PR [#8107](https://github.com/vatesfr/xen-orchestra/pull/8107))
- [REST/VM] When creating a VM, the template's VIFs are created. It is also possible to create more VIFs or delete/update template's VIFs (PR [#8137](https://github.com/vatesfr/xen-orchestra/pull/8137))

### Bug fixes

Expand Down Expand Up @@ -40,6 +41,7 @@
- @xen-orchestra/web patch
- @xen-orchestra/web-core minor
- @xen-orchestra/xapi patch
- xo-server minor
- xo-web minor

<!--packages-end-->
9 changes: 0 additions & 9 deletions packages/xo-server/src/api/vm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -340,15 +340,6 @@ create.params = {
},
device: { type: 'string', optional: true },
remove: { type: 'boolean', optional: true },

// device: {
// optional: true,
// type: 'string',
// },
// remove: {
// optional: true,
// type: 'boolean',
// },
},
},
},
Expand Down
5 changes: 2 additions & 3 deletions packages/xo-web/src/xo-app/new-vm/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -485,9 +485,9 @@ export default class NewVm extends BaseComponent {
const resourceSet = this._getResourceSet()
const { template } = this.props

// In case the user remove some VIFs created by the template
// In case user deletes some VIF created by the template
// We need to mark them with `remove:true`
// so that xo-server correctly remove it
// so that xo-server deletes them properly
if (_VIFs.length < templateVifs.length) {
const _vifByDevice = keyBy(_VIFs, 'device')
templateVifs.forEach(templateVif => {
Expand All @@ -497,7 +497,6 @@ export default class NewVm extends BaseComponent {
})
}

// return
// Either use `memory` OR `memory*` params
let { memory, memoryStaticMax, memoryDynamicMin, memoryDynamicMax } = state
if ((memoryStaticMax != null || memoryDynamicMin != null) && memoryDynamicMax == null) {
Expand Down

0 comments on commit 431f639

Please sign in to comment.