Skip to content

Commit 722a36d

Browse files
committed
Remove Hz info from UI
1 parent 4aaa850 commit 722a36d

4 files changed

Lines changed: 7 additions & 8 deletions

File tree

ui/legacy/scripts/metrics.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@
320320
cpunumber: {
321321
label: 'label.metrics.num.cpu.cores',
322322
},
323-
cputotalghz: {
324-
label: 'label.metrics.cpu.total'
325-
},
323+
// cputotalghz: {
324+
// label: 'label.metrics.cpu.total'
325+
// },
326326
cpuusedghz: {
327327
label: 'label.metrics.cpu.used.avg',
328328
thresholdcolor: true,

ui/src/components/view/InfoCard.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@
129129
<div class="resource-detail-item__label">{{ $t('label.cpu') }}</div>
130130
<div class="resource-detail-item__details">
131131
<a-icon type="appstore" />
132-
<span v-if="resource.cputotal">{{ resource.cputotal }}</span>
133-
<span v-else>{{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz</span>
132+
<span>{{ resource.cpunumber }} CPU</span>
134133
</div>
135134
<div>
136135
<span v-if="resource.cpuused">

ui/src/config/section/offering.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ export default {
2929
icon: 'cloud',
3030
permission: ['listServiceOfferings', 'listDomains'],
3131
params: { isrecursive: 'true' },
32-
columns: ['name', 'displaytext', 'cpunumber', 'cpuspeed', 'memory', 'domain', 'zone', 'order'],
32+
columns: ['name', 'displaytext', 'cpunumber', 'memory', 'domain', 'zone', 'order'],
3333
details: () => {
34-
var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created']
34+
var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created']
3535
if (store.getters.apis.createServiceOffering &&
3636
store.getters.apis.createServiceOffering.params.filter(x => x.name === 'storagepolicy').length > 0) {
3737
fields.splice(6, 0, 'vspherestoragepolicy')

ui/src/views/compute/wizard/ComputeOfferingSelection.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export default {
171171
return {
172172
key: item.id,
173173
name: item.name,
174-
cpu: cpuNumberValue.length > 0 ? `${cpuNumberValue} CPU x ${cpuSpeedValue} Ghz` : '',
174+
cpu: cpuNumberValue.length > 0 ? `${cpuNumberValue} CPU` : '',
175175
ram: ramValue.length > 0 ? `${ramValue} MB` : '',
176176
disabled: disabled
177177
}

0 commit comments

Comments
 (0)