Skip to content

Fix disk offering override in VM deployment wizard #8070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoaoJandre merged 2 commits into from
Mar 8, 2024
Merged

Fix disk offering override in VM deployment wizard #8070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a490e74
Fix disk offering override in VM deployment wizard
winterhazel Sep 18, 2023
b08c501
Reduce indentation
winterhazel Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 8 additions & 24 deletions ui/src/views/compute/DeployVM.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,36 +1331,20 @@ export default {
}

this.serviceOffering = _.find(this.options.serviceOfferings, (option) => option.id === instanceConfig.computeofferingid)
if (this.serviceOffering?.diskofferingid) {
if (iso) {
this.diskOffering = _.find(this.options.diskOfferings, (option) => option.id === this.serviceOffering.diskofferingid)
} else {
instanceConfig.overridediskofferingid = this.serviceOffering.diskofferingid
}
}
if (!iso && this.diskSelected) {
this.diskOffering = _.find(this.options.diskOfferings, (option) => option.id === instanceConfig.diskofferingid)
}
if (this.rootDiskSelected?.id) {
instanceConfig.overridediskofferingid = this.rootDiskSelected.id
}

instanceConfig.overridediskofferingid = this.rootDiskSelected?.id || this.serviceOffering?.diskofferingid
if (instanceConfig.overridediskofferingid) {
this.overrideDiskOffering = _.find(this.options.diskOfferings, (option) => option.id === instanceConfig.overridediskofferingid)
} else {
this.overrideDiskOffering = null
}

if (!iso && this.diskSelected) {
if (iso && this.serviceOffering?.diskofferingid) {
this.diskOffering = _.find(this.options.diskOfferings, (option) => option.id === this.serviceOffering.diskofferingid)
} else if (!iso && this.diskSelected) {
this.diskOffering = _.find(this.options.diskOfferings, (option) => option.id === instanceConfig.diskofferingid)
}
if (this.rootDiskSelected?.id) {
instanceConfig.overridediskofferingid = this.rootDiskSelected.id
}
if (instanceConfig.overridediskofferingid) {
this.overrideDiskOffering = _.find(this.options.diskOfferings, (option) => option.id === instanceConfig.overridediskofferingid)
} else {
this.overrideDiskOffering = null
}

Comment thread
DaanHoogland marked this conversation as resolved.
this.zone = _.find(this.options.zones, (option) => option.id === instanceConfig.zoneid)
this.affinityGroups = _.filter(this.options.affinityGroups, (option) => _.includes(instanceConfig.affinitygroupids, option.id))
this.networks = this.getSelectedNetworksWithExistingConfig(_.filter(this.options.networks, (option) => _.includes(instanceConfig.networkids, option.id)))
Expand Down Expand Up @@ -1637,6 +1621,7 @@ export default {
this.showRootDiskSizeChanger = false
} else {
this.rootDiskSelected = null
this.form.overridediskofferingid = undefined
}
this.showOverrideDiskOfferingOption = val
},
Expand Down Expand Up @@ -1875,7 +1860,6 @@ export default {
if (this.loading.deploy) return
this.formRef.value.validate().then(async () => {
const values = toRaw(this.form)

if (!values.templateid && !values.isoid) {
this.$notification.error({
message: this.$t('message.request.failed'),
Expand Down Expand Up @@ -1962,7 +1946,7 @@ export default {
if (this.selectedTemplateConfiguration) {
deployVmData['details[0].configurationId'] = this.selectedTemplateConfiguration.id
}
if (!this.serviceOffering.diskofferingstrictness && values.overridediskofferingid) {
if (!this.serviceOffering.diskofferingstrictness && values.overridediskofferingid && !values.isoid) {
deployVmData.overridediskofferingid = values.overridediskofferingid
if (values.rootdisksize && values.rootdisksize > 0) {
deployVmData.rootdisksize = values.rootdisksize
Expand Down
1 change: 1 addition & 0 deletions ui/src/views/compute/wizard/DiskOfferingSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ export default {
this.selectedRowKeys = value
this.$emit('select-disk-offering-item', value[0])
this.$emit('on-selected-disk-size', this.diskSelected)
this.$emit('on-selected-root-disk-size', this.diskSelected)
},
handleSearch (value) {
this.filter = value
Expand Down