diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue index 51d91c04a521..42ac8e42a189 100644 --- a/ui/src/components/view/InfoCard.vue +++ b/ui/src/components/view/InfoCard.vue @@ -129,8 +129,7 @@
{{ $t('label.cpu') }}
- {{ resource.cputotal }} - {{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz + {{ resource.cpunumber }} CPU
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index f821ec58002d..c99b95b536e3 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -39,7 +39,7 @@ export default { }, columns: () => { const fields = ['displayname', 'name', 'state', 'ipaddress'] - const metricsFields = ['cpunumber', 'cpuused', 'cputotal', + const metricsFields = ['cpunumber', 'cpuused', { memoryused: (record) => { return record.memorykbs && record.memoryintfreekbs ? parseFloat(100.0 * (record.memorykbs - record.memoryintfreekbs) / record.memorykbs).toFixed(2) + '%' : '0.0%' diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js index 5dacd7afd218..d6730f0ba250 100644 --- a/ui/src/config/section/offering.js +++ b/ui/src/config/section/offering.js @@ -29,9 +29,9 @@ export default { icon: 'cloud', permission: ['listServiceOfferings', 'listDomains'], params: { isrecursive: 'true' }, - columns: ['name', 'displaytext', 'cpunumber', 'cpuspeed', 'memory', 'domain', 'zone', 'order'], + columns: ['name', 'displaytext', 'cpunumber', 'memory', 'domain', 'zone', 'order'], details: () => { - var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created'] + var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created'] if (store.getters.apis.createServiceOffering && store.getters.apis.createServiceOffering.params.filter(x => x.name === 'storagepolicy').length > 0) { fields.splice(6, 0, 'vspherestoragepolicy') diff --git a/ui/src/views/compute/wizard/ComputeOfferingSelection.vue b/ui/src/views/compute/wizard/ComputeOfferingSelection.vue index f1a6128872e8..ef492bcfe6d0 100644 --- a/ui/src/views/compute/wizard/ComputeOfferingSelection.vue +++ b/ui/src/views/compute/wizard/ComputeOfferingSelection.vue @@ -136,7 +136,6 @@ export default { var maxCpuSpeed = item.cpuspeed var maxMemory = item.memory var cpuNumberValue = (item.cpunumber !== null && item.cpunumber !== undefined && item.cpunumber > 0) ? item.cpunumber + '' : '' - var cpuSpeedValue = (item.cpuspeed !== null && item.cpuspeed !== undefined && item.cpuspeed > 0) ? parseFloat(item.cpuspeed / 1000.0).toFixed(2) + '' : '' var ramValue = (item.memory !== null && item.memory !== undefined && item.memory > 0) ? item.memory + '' : '' if (item.iscustomized === true) { if ('serviceofferingdetails' in item && @@ -171,7 +170,7 @@ export default { return { key: item.id, name: item.name, - cpu: cpuNumberValue.length > 0 ? `${cpuNumberValue} CPU x ${cpuSpeedValue} Ghz` : '', + cpu: cpuNumberValue.length > 0 ? `${cpuNumberValue} CPU` : '', ram: ramValue.length > 0 ? `${ramValue} MB` : '', disabled: disabled }