From 55ef76a3b60e6adabde2f9a299c471dd5700e9c6 Mon Sep 17 00:00:00 2001 From: Sandeepa Singh Date: Wed, 21 Apr 2021 15:44:45 +0530 Subject: Add processors table missing properties - Add following missing properties: Name, Spare part number, Model, Processor type, Processor architechure, Version, Health rollup, Asset tag, Min speed MHz, Max speed MHz, Total cores, Total threads, Instruction set, Identify Led - Design of the table has been updated - Waiting for the following to be merged to test the Identify Led: https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/37045 Signed-off-by: Sandeepa Singh Change-Id: If6eeb3b0afea6510f7ea53e2d66cbf1d123b3217 --- src/assets/styles/bmc/custom/_index.scss | 1 + src/assets/styles/bmc/custom/_section-divider.scss | 3 + src/assets/styles/bmc/custom/_tables.scss | 1 + src/locales/en-US.json | 17 ++- src/store/modules/Health/ProcessorStore.js | 43 ++++++++ .../HardwareStatusTableProcessors.vue | 114 +++++++++++++++++---- 6 files changed, 154 insertions(+), 25 deletions(-) create mode 100644 src/assets/styles/bmc/custom/_section-divider.scss (limited to 'src') diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss index 9d6218ff..74594e35 100644 --- a/src/assets/styles/bmc/custom/_index.scss +++ b/src/assets/styles/bmc/custom/_index.scss @@ -12,6 +12,7 @@ @import "./kvm"; @import "./modal"; @import "./pagination"; +@import "./section-divider"; @import "./sol"; @import "./tables"; @import "./toasts"; \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_section-divider.scss b/src/assets/styles/bmc/custom/_section-divider.scss new file mode 100644 index 00000000..620c9e56 --- /dev/null +++ b/src/assets/styles/bmc/custom/_section-divider.scss @@ -0,0 +1,3 @@ +.section-divider { + border-bottom: 1px solid gray('400'); + } \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_tables.scss b/src/assets/styles/bmc/custom/_tables.scss index 6efe2ba0..e8b5a832 100644 --- a/src/assets/styles/bmc/custom/_tables.scss +++ b/src/assets/styles/bmc/custom/_tables.scss @@ -59,6 +59,7 @@ background-color: theme-color("light"); td { padding-left: calc(50px + (#{$table-cell-padding} * 2)); + padding-right: calc(50px + (#{$table-cell-padding} * 2)); } dl { margin: 0; diff --git a/src/locales/en-US.json b/src/locales/en-US.json index 31b44462..33048f6d 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -384,29 +384,40 @@ "graphicalConsole": "Graphical console", "hardwareType": "Hardware type", "health": "Health", + "healthRollup": "Health rollup", "id": "ID", "identifyLed": "Identify LED", "indicatorLed": "Indicator LED", "locationNumber": "Location number", "instructionSet": "Instruction set", + "locationNumber": "Location number", "manufacturer": "Manufacturer", "maxConcurrentSessions": "Max concurrent sessions", + "maxSpeedMHz": "Max speed MHz", + "minSpeedMHz": "Min speed MHz", "model": "Model", "name": "Name", "partNumber": "Part number", "powerInputWatts": "Power input watts", "powerState": "Power state", - "processorArchitecture": "Architecture", - "processorType": "Type", + "processorArchitecture": "Processor architecture", + "processorType": "Processor type", "serialConsole": "Serial console", "serialNumber": "Serial number", "serviceEnabled": "Service enabled", "serviceEntryPointUuid": "Service entry point UUID", + "sparePartNumber": "Spare part number", "statusHealthRollup": "Status (Health rollup)", "statusState": "Status (State)", "systemType": "System type", "totalCores": "Total cores", - "uuid": "UUID" + "totalThreads": "Total threads", + "uuid": "UUID", + "version": "Version" + }, + "toast": { + "errorDisableIdentifyLed": "Error disabling Identify LED.", + "errorEnableIdentifyLed": "Error enabling Identify LED." } }, "pageKvm": { diff --git a/src/store/modules/Health/ProcessorStore.js b/src/store/modules/Health/ProcessorStore.js index 4a67c6b0..15314663 100644 --- a/src/store/modules/Health/ProcessorStore.js +++ b/src/store/modules/Health/ProcessorStore.js @@ -1,4 +1,5 @@ import api from '@/store/api'; +import i18n from '@/i18n'; const ProcessorStore = { namespaced: true, @@ -16,18 +17,28 @@ const ProcessorStore = { Status = {}, PartNumber, SerialNumber, + SparePartNumber, InstructionSet, Manufacturer, Model, Name, ProcessorArchitecture, ProcessorType, + Version, + AssetTag, + MinSpeedMHz, + MaxSpeedMHz, TotalCores, + TotalThreads, + LocationNumber, + LocationIndicatorActive, } = processor; return { id: Id, health: Status.Health, + healthRollup: Status.HealthRollup, partNumber: PartNumber, + sparePartNumber: SparePartNumber, serialNumber: SerialNumber, statusState: Status.State, instructionSet: InstructionSet, @@ -36,7 +47,15 @@ const ProcessorStore = { name: Name, processorArchitecture: ProcessorArchitecture, processorType: ProcessorType, + version: Version, + assetTag: AssetTag, + minSpeedMHz: MinSpeedMHz, + maxSpeedMHz: MaxSpeedMHz, totalCores: TotalCores, + totalThreads: TotalThreads, + locationNumber: LocationNumber, + identifyLed: LocationIndicatorActive, + uri: processor['@odata.id'], }; }); }, @@ -55,6 +74,30 @@ const ProcessorStore = { }) .catch((error) => console.log(error)); }, + // Waiting for the following to be merged to test the Identify Led: + // https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/37045 + async updateIdentifyLedValue({ dispatch }, led) { + const uri = led.uri; + const updatedIdentifyLedValue = { + LocationIndicatorActive: led.identifyLed, + }; + return await api + .patch(uri, updatedIdentifyLedValue) + .then(() => dispatch('getProcessorsInfo')) + .catch((error) => { + dispatch('getProcessorsInfo'); + console.log('error', error); + if (led.identifyLed) { + throw new Error( + i18n.t('pageHardwareStatus.toast.errorEnableIdentifyLed') + ); + } else { + throw new Error( + i18n.t('pageHardwareStatus.toast.errorDisableIdentifyLed') + ); + } + }); + }, }, }; diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue b/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue index 27f3bd83..e3b5735d 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue @@ -47,41 +47,97 @@ {{ value }} + + + +