From b89a53c8d4a740c959b12938445917c3df5d3d4b Mon Sep 17 00:00:00 2001 From: Yoshie Muranaka Date: Mon, 15 Jun 2020 13:25:46 -0700 Subject: Add Fans table to hardware status page Add Fan items at /redfish/v1/Chassis/chassis/Thermal endpoint to table with expansion row to view details. Signed-off-by: Yoshie Muranaka Change-Id: I1f69e30748f8dec62647468c4fd2e5b3947716d9 --- src/locales/en-US.json | 1 + src/store/index.js | 4 +- src/store/modules/Health/FanStore.js | 35 +++++++ src/views/Health/HardwareStatus/HardwareStatus.vue | 16 ++- .../HardwareStatus/HardwareStatusTableFans.vue | 108 +++++++++++++++++++++ 5 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 src/store/modules/Health/FanStore.js create mode 100644 src/views/Health/HardwareStatus/HardwareStatusTableFans.vue (limited to 'src') diff --git a/src/locales/en-US.json b/src/locales/en-US.json index 4397b2cc..9c260138 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -128,6 +128,7 @@ }, "pageHardwareStatus": { "dimmSlot": "DIMM slot", + "fans": "Fans", "powerSupplies": "Power supplies", "system": "System", "table": { diff --git a/src/store/index.js b/src/store/index.js index b4e030ba..c4c0948f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -17,6 +17,7 @@ import ServerLedStore from './modules/Control/ServerLedStore'; import SystemStore from './modules/Health/SystemStore'; import PowerSupplyStore from './modules/Health/PowerSupplyStore'; import MemoryStore from './modules/Health/MemoryStore'; +import FanStore from './modules/Health/FanStore'; import WebSocketPlugin from './plugins/WebSocketPlugin'; @@ -42,7 +43,8 @@ export default new Vuex.Store({ sslCertificates: SslCertificatesStore, serverLed: ServerLedStore, system: SystemStore, - memory: MemoryStore + memory: MemoryStore, + fan: FanStore }, plugins: [WebSocketPlugin] }); diff --git a/src/store/modules/Health/FanStore.js b/src/store/modules/Health/FanStore.js new file mode 100644 index 00000000..2de388bf --- /dev/null +++ b/src/store/modules/Health/FanStore.js @@ -0,0 +1,35 @@ +import api from '@/store/api'; + +const FanStore = { + namespaced: true, + state: { + fans: [] + }, + getters: { + fans: state => state.fans + }, + mutations: { + setFanInfo: (state, data) => { + state.fans = data.map(fan => { + const { MemberId, Status = {}, PartNumber, SerialNumber } = fan; + return { + id: MemberId, + health: Status.Health, + partNumber: PartNumber, + serialNumber: SerialNumber, + statusState: Status.State + }; + }); + } + }, + actions: { + async getFanInfo({ commit }) { + return await api + .get('/redfish/v1/Chassis/chassis/Thermal') + .then(({ data: { Fans = [] } }) => commit('setFanInfo', Fans)) + .catch(error => console.log(error)); + } + } +}; + +export default FanStore; diff --git a/src/views/Health/HardwareStatus/HardwareStatus.vue b/src/views/Health/HardwareStatus/HardwareStatus.vue index 4d29a3d9..c104ea33 100644 --- a/src/views/Health/HardwareStatus/HardwareStatus.vue +++ b/src/views/Health/HardwareStatus/HardwareStatus.vue @@ -8,6 +8,9 @@ + + + @@ -18,10 +21,17 @@ import PageTitle from '@/components/Global/PageTitle'; import TableSystem from './HardwareStatusTableStystem'; import TablePowerSupplies from './HardwareStatusTablePowerSupplies'; import TableDimmSlot from './HardwareStatusTableDimmSlot'; +import TableFans from './HardwareStatusTableFans'; import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; export default { - components: { PageTitle, TableDimmSlot, TablePowerSupplies, TableSystem }, + components: { + PageTitle, + TableDimmSlot, + TablePowerSupplies, + TableSystem, + TableFans + }, mixins: [LoadingBarMixin], created() { this.startLoader(); @@ -31,6 +41,9 @@ export default { const dimmSlotTablePromise = new Promise(resolve => { this.$root.$on('hardwareStatus::dimmSlot::complete', () => resolve()); }); + const fansTablePromise = new Promise(resolve => { + this.$root.$on('hardwareStatus::fans::complete', () => resolve()); + }); const powerSuppliesTablePromise = new Promise(resolve => { this.$root.$on('hardwareStatus::powerSupplies::complete', () => resolve() @@ -41,6 +54,7 @@ export default { Promise.all([ systemTablePromise, dimmSlotTablePromise, + fansTablePromise, powerSuppliesTablePromise ]).finally(() => this.endLoader()); }, diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue b/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue new file mode 100644 index 00000000..6cf51a2a --- /dev/null +++ b/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue @@ -0,0 +1,108 @@ + + + -- cgit v1.2.3