diff options
author | Yoshie Muranaka <yoshiemuranaka@gmail.com> | 2020-06-02 22:01:27 +0300 |
---|---|---|
committer | Yoshie Muranaka <yoshiemuranaka@gmail.com> | 2020-06-17 23:38:34 +0300 |
commit | c687f101324f301de04e326b2937953a395a5fed (patch) | |
tree | a4dae893fa5e09cd2ac78959b6422f6e0d16f170 /src/store/modules | |
parent | 56ee769fd5a3df93eb275859a712700a7ba54944 (diff) | |
download | webui-vue-c687f101324f301de04e326b2937953a395a5fed.tar.xz |
Refactor Overview page
Use SystemStore to get Server information values on the
overview page. Added missing properties to SystemStore
and removed hostFirmware from FirmwareStore.
Signed-off-by: Yoshie Muranaka <yoshiemuranaka@gmail.com>
Change-Id: I5923adb0345f0de28f9a66f460e41d15f87f743a
Diffstat (limited to 'src/store/modules')
-rw-r--r-- | src/store/modules/Configuration/FirmwareStore.js | 21 | ||||
-rw-r--r-- | src/store/modules/Health/SystemStore.js | 2 | ||||
-rw-r--r-- | src/store/modules/Overview/OverviewStore.js | 48 |
3 files changed, 5 insertions, 66 deletions
diff --git a/src/store/modules/Configuration/FirmwareStore.js b/src/store/modules/Configuration/FirmwareStore.js index cae74ebc..5ec9173a 100644 --- a/src/store/modules/Configuration/FirmwareStore.js +++ b/src/store/modules/Configuration/FirmwareStore.js @@ -3,18 +3,14 @@ import api from '../../api'; const FirmwareStore = { namespaced: true, state: { - bmcFirmwareVersion: '--', - hostFirmwareVersion: '--' + bmcFirmwareVersion: '--' }, getters: { - bmcFirmwareVersion: state => state.bmcFirmwareVersion, - hostFirmwareVersion: state => state.hostFirmwareVersion + bmcFirmwareVersion: state => state.bmcFirmwareVersion }, mutations: { setBmcFirmwareVersion: (state, bmcFirmwareVersion) => - (state.bmcFirmwareVersion = bmcFirmwareVersion), - setHostFirmwareVersion: (state, hostFirmwareVersion) => - (state.hostFirmwareVersion = hostFirmwareVersion) + (state.bmcFirmwareVersion = bmcFirmwareVersion) }, actions: { async getBmcFirmware({ commit }) { @@ -27,17 +23,6 @@ const FirmwareStore = { .catch(error => { console.log(error); }); - }, - async getHostFirmware({ commit }) { - return await api - .get('/redfish/v1/Systems/system') - .then(response => { - const hostFirmwareVersion = response.data.BiosVersion; - commit('setHostFirmwareVersion', hostFirmwareVersion); - }) - .catch(error => { - console.log(error); - }); } } }; diff --git a/src/store/modules/Health/SystemStore.js b/src/store/modules/Health/SystemStore.js index 9c4c477d..828b78bd 100644 --- a/src/store/modules/Health/SystemStore.js +++ b/src/store/modules/Health/SystemStore.js @@ -13,9 +13,11 @@ const SystemStore = { const system = {}; system.assetTag = data.AssetTag; system.description = data.Description; + system.firmwareVersion = data.BiosVersion; system.health = data.Status.Health; system.id = data.Id; system.indicatorLed = data.IndicatorLED; + system.manufacturer = data.Manufacturer; system.model = data.Model; system.partNumber = data.PartNumber; system.powerState = data.PowerState; diff --git a/src/store/modules/Overview/OverviewStore.js b/src/store/modules/Overview/OverviewStore.js deleted file mode 100644 index 314728cc..00000000 --- a/src/store/modules/Overview/OverviewStore.js +++ /dev/null @@ -1,48 +0,0 @@ -import api from '../../api'; - -const OverviewStore = { - namespaced: true, - state: { - serverInfo: null, - serverModel: '--', - serverManufacturer: '--', - serverSerialNumber: '--' - }, - getters: { - serverInfo: state => state.serverInfo, - serverModel: state => state.serverModel, - serverManufacturer: state => state.serverManufacturer, - serverSerialNumber: state => state.serverSerialNumber - }, - mutations: { - setServerInfo: (state, serverInfo) => (state.serverInfo = serverInfo), - setServerModel: (state, serverModel) => (state.serverModel = serverModel), - setServerManufacturer: (state, serverManufacturer) => - (state.serverManufacturer = serverManufacturer), - setServerSerialNumber: (state, serverSerialNumber) => - (state.serverSerialNumber = serverSerialNumber) - }, - actions: { - async getServerInfo({ commit }) { - return await api - .get('/redfish/v1/Systems/system') - .then(response => { - const serverInfo = response.data; - if (serverInfo.Model) { - commit('setServerModel', serverInfo.Model); - } - if (serverInfo.SerialNumber) { - commit('setServerSerialNumber', serverInfo.SerialNumber); - } - if (serverInfo.Manufacturer) { - commit('setServerManufacturer', serverInfo.Manufacturer); - } - }) - .catch(error => { - console.log(error); - }); - } - } -}; - -export default OverviewStore; |