diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 372cd3166d6c..9f367b8bb997 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -2987,6 +2987,7 @@
"message.error.zone.name": "Please enter zone name",
"message.error.zone.type": "Please select zone type",
"message.error.linstor.resourcegroup": "Please enter the Linstor Resource-Group",
+"message.error.fixed.offering.kvm": "It's not possible to scale up VMs that utilize KVM hypervisor with a fixed compute offering.",
"message.fail.to.delete": "Failed to delete.",
"message.failed.to.add": "Failed to add",
"message.failed.to.assign.vms": "Failed to assign VMs",
diff --git a/ui/public/locales/pt_BR.json b/ui/public/locales/pt_BR.json
index 9dd3c63000e6..1294c690ee3f 100644
--- a/ui/public/locales/pt_BR.json
+++ b/ui/public/locales/pt_BR.json
@@ -2144,6 +2144,7 @@
"message.enabling.zone.dots": "Habilitando Zona....",
"message.enter.seperated.list.multiple.cidrs": "Por favor entre a de CIDRs separadas por v\u00edrgula, se houver mais de uma",
"message.enter.token": "Por favor entre o token que voc\u00ea recebeu no e-mail privado.",
+"message.error.fixed.offering.kvm": "Não é possível escalar VMs que utilizam o hipervisor KVM com oferta de computa\u00e7\u00e3o fixa.",
"message.generate.keys": "Por favor confirme que voc\u00ea deseja gerar novas chaves para este usu\u00e1rio.",
"message.gslb.delete.confirm": "Confirme que voc\u00ea deseja apagar este GSLB",
"message.gslb.lb.remove.confirm": "Confirme que voc\u00ea deseja remover o balanceamento de carga deste GSLB",
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index 835923d9f07e..f1f23405a08b 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -301,7 +301,7 @@ export default {
label: 'label.scale.vm',
docHelp: 'adminguide/virtual_machines.html#how-to-dynamically-scale-cpu-and-ram',
dataView: true,
- show: (record) => { return ['Stopped'].includes(record.state) || (['Running'].includes(record.state) && record.hypervisor !== 'KVM' && record.hypervisor !== 'LXC') },
+ show: (record) => { return ['Stopped'].includes(record.state) || (['Running'].includes(record.state) && record.hypervisor !== 'LXC') },
disabled: (record) => { return record.state === 'Running' && !record.isdynamicallyscalable },
popup: true,
component: () => import('@/views/compute/ScaleVM.vue')
diff --git a/ui/src/views/compute/ScaleVM.vue b/ui/src/views/compute/ScaleVM.vue
index a0cf5b197a1e..9c9934048fa1 100644
--- a/ui/src/views/compute/ScaleVM.vue
+++ b/ui/src/views/compute/ScaleVM.vue
@@ -23,6 +23,10 @@
+
+
+
+
offering.id === this.resource.serviceofferingid)
+ this.currentOffer = this.offerings[0]
+ if (this.currentOffer === undefined) {
+ this.fixedOfferingKvm = true
+ }
+ }
this.offerings.map(i => { this.offeringsMap[i.id] = i })
}).finally(() => {
this.loading = false
@@ -131,6 +144,13 @@ export default {
}
return this.selectedOffering?.serviceofferingdetails?.minmemory * 1 || 32
},
+ getCPUSpeed () {
+ // We can only scale up while a VM is running
+ if (this.resource.state === 'Running') {
+ return this.resource.cpuspeed
+ }
+ return this.selectedOffering?.serviceofferingdetails?.cpuspeed * 1 || 1
+ },
getMessage () {
if (this.resource.hypervisor === 'VMware') {
return this.$t('message.read.admin.guide.scaling.up')
diff --git a/ui/src/views/compute/wizard/ComputeSelection.vue b/ui/src/views/compute/wizard/ComputeSelection.vue
index 5fe75d681780..d1bf992f3ef3 100644
--- a/ui/src/views/compute/wizard/ComputeSelection.vue
+++ b/ui/src/views/compute/wizard/ComputeSelection.vue
@@ -107,6 +107,10 @@ export default {
type: Boolean,
default: true
},
+ cpuSpeed: {
+ type: Number,
+ default: 0
+ },
minCpu: {
type: Number,
default: 0
@@ -198,6 +202,7 @@ export default {
fillValue () {
this.cpuNumberInputValue = this.minCpu
this.memoryInputValue = this.minMemory
+ this.cpuSpeedInputValue = this.cpuSpeed
if (!this.preFillContent) {
this.updateComputeCpuNumber(this.cpuNumberInputValue)