openstack/skyline-console
Code Issues Proposed changes

Merge "feat: Update flavor detail page"

Browse Source
This commit is contained in:
Zuul 2021-12-16 07:21:26 +00:00 committed by Gerrit Code Review
commit d884b0ba6e
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/locales/en.json
View File

@ -1178,7 +1178,7 @@
"Memory": "Memory", "Memory": "Memory",
"Memory Optimized": "Memory Optimized", "Memory Optimized": "Memory Optimized",
"Memory Page": "Memory Page", "Memory Page": "Memory Page",
"Memory Page Value": "Memory Page Value", "Memory Page Size": "Memory Page Size",
"Memory Usage": "Memory Usage", "Memory Usage": "Memory Usage",
"Memory usage Num (GB": "Memory usage Num (GB", "Memory usage Num (GB": "Memory usage Num (GB",
"Message": "Message", "Message": "Message",

4
src/locales/zh.json
View File

@ -104,7 +104,7 @@
"Anti-affinity (mandatory):": "反亲和(强制)：", "Anti-affinity (mandatory):": "反亲和(强制)：",
"Anti-affinity (not mandatory):": "反亲和 (非强制)：", "Anti-affinity (not mandatory):": "反亲和 (非强制)：",
"Antigua and Barbuda": "安提瓜和巴布达", "Antigua and Barbuda": "安提瓜和巴布达",
"Any": "", "Any": "任意",
"Any(Random)": "任意（随机）", "Any(Random)": "任意（随机）",
"Application Credentials": "应用凭证", "Application Credentials": "应用凭证",
"Application Template": "应用模板", "Application Template": "应用模板",
@ -1178,7 +1178,7 @@
"Memory": "内存", "Memory": "内存",
"Memory Optimized": "内存型", "Memory Optimized": "内存型",
"Memory Page": "内存页", "Memory Page": "内存页",
"Memory Page Value": "内存页值", "Memory Page Size": "内存页大小",
"Memory Usage": "内存使用量", "Memory Usage": "内存使用量",
"Memory usage Num (GB": "内存用量 (GB)", "Memory usage Num (GB": "内存用量 (GB)",
"Message": "消息", "Message": "消息",

15
src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx
View File

@ -100,6 +100,7 @@ export default class BaseDetail extends Base {
const { category, architecture } = this.detailData; const { category, architecture } = this.detailData;
const hasIOPS = categoryHasIOPS(category); const hasIOPS = categoryHasIOPS(category);
const hasEphemeral = categoryHasEphemeral(category); const hasEphemeral = categoryHasEphemeral(category);
const typeIsComputeOptimized = isComputeOptimized(category);
if (isBareMetal(architecture)) { if (isBareMetal(architecture)) {
return this.getBareMetalCard(); return this.getBareMetalCard();
} }
@ -133,6 +134,18 @@ export default class BaseDetail extends Base {
}, },
}); });
} }
if (!typeIsComputeOptimized) {
const numaItem = {
label: t('NUMA Node Count'),
dataIndex: 'hw:numa_nodes',
};
const memPageItem = {
label: t('Memory Page Size'),
dataIndex: 'hw:mem_page_size',
render: (value) => (value && pageTypeMap[value]) || value || '-',
};
options.push(...[numaItem, memPageItem]);
}
return { return {
title: t('Base Info'), title: t('Base Info'),
@ -224,7 +237,7 @@ export default class BaseDetail extends Base {
render: (value) => cpuThreadPolicyMap[value] || '-', render: (value) => cpuThreadPolicyMap[value] || '-',
}, },
{ {
label: t('Memory Page'), label: t('Memory Page Size'),
dataIndex: 'hw:mem_page_size', dataIndex: 'hw:mem_page_size',
render: (value) => pageTypeMap[value] || '-', render: (value) => pageTypeMap[value] || '-',
}, },

4
src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx
View File

@ -414,7 +414,7 @@ export class ParamSetting extends Base {
}, },
{ {
name: 'memPageSizeValueMore', name: 'memPageSizeValueMore',
label: t('Memory Page Value'), label: t('Memory Page Size'),
type: 'input', type: 'input',
hidden: !showPageSizeInputMore, hidden: !showPageSizeInputMore,
required: showPageSizeInputMore, required: showPageSizeInputMore,
@ -499,7 +499,7 @@ export class ParamSetting extends Base {
}, },
{ {
name: 'memPageSizeValue', name: 'memPageSizeValue',
label: t('Memory Page Value'), label: t('Memory Page Size'),
type: 'input', type: 'input',
hidden: !showPageSizeInput, hidden: !showPageSizeInput,
required: showPageSizeInput, required: showPageSizeInput,