Skip to content

Hide Hz info #1

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

Open
OlegChuev wants to merge 1 commit into
base: 4.15
Choose a base branch
from
Open

Hide Hz info #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions ui/src/components/view/InfoCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@
<div class="resource-detail-item__label">{{ $t('label.cpu') }}</div>
<div class="resource-detail-item__details">
<a-icon type="appstore" />
<span v-if="resource.cputotal">{{ resource.cputotal }}</span>
<span v-else>{{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz</span>
<span>{{ resource.cpunumber }} CPU</span>
</div>
<div>
<span v-if="resource.cpuused">
Expand Down
2 changes: 1 addition & 1 deletion ui/src/config/section/compute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%'
Expand Down
4 changes: 2 additions & 2 deletions ui/src/config/section/offering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
3 changes: 1 addition & 2 deletions ui/src/views/compute/wizard/ComputeOfferingSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -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
}
Expand Down