winterhazel commented on code in PR #8070:
URL: https://github.com/apache/cloudstack/pull/8070#discussion_r1511472473
##########
ui/src/views/compute/DeployVM.vue:
##########
@@ -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
- }
+
Review Comment:
Nope, that's not the same thing.
Inside `if (iso && this.serviceOffering?.diskofferingid)`, we are searching
for a disk offering with an id matching `this.serviceOffering.diskofferingid`;
inside `else if (!iso && this.diskSelected)`, we are searching for a disk
offering with an id matching `instanceConfig.diskofferingid`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
