Merge branch 'sila-ui' into sila

4 files changed, 167 insertions, 3 deletions

diff --git a/src/store/modules/HardwareStatus/FanStore.js b/src/store/modules/HardwareStatus/FanStore.js
index fca1f326..fed3f742 100644
--- a/src/store/modules/HardwareStatus/FanStore.js
+++ b/src/store/modules/HardwareStatus/FanStore.js
@@ -1,12 +1,15 @@
 import api from '@/store/api';
+import { fanType } from '@/utilities/_sila/tableParser';
 
 const FanStore = {
   namespaced: true,
   state: {
     fans: [],
+    fansLastHour: [],
   },
   getters: {
     fans: (state) => state.fans,
+    fansLastHour: (state) => state.fansLastHour,
   },
   mutations: {
     setFanInfo: (state, data) => {
@@ -32,12 +35,40 @@ const FanStore = {
           locationNumber: Location,
           name: Name,
           speed: Reading + ' ' + ReadingUnits,
+          speedRPM: Reading,
+          type: fanType(Name),
           statusState: Status.State,
         };
       });
     },
+
+    setFansDynamic: (state, data) => {
+      state.fans = data;
+    },
+    setFansDynamicLastHour: (state, data) => {
+      state.fansLastHour = data;
+    },
   },
   actions: {
+    async getFansDynamic({ commit }, { lastHour }) {
+      let url = null;
+      if (lastHour) {
+        url =
+          '/redfish/v1/TelemetryService/MetricReports/hour_data&id=fans&period=last_hour';
+      } else {
+        url = '/redfish/v1/TelemetryService/MetricReports/hour_data&id=fans';
+      }
+      return await api
+        .get(url)
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setFansDynamicLastHour', MetricValues);
+          } else {
+            commit('setFansDynamic', MetricValues);
+          }
+        })
+        .catch((error) => console.log(error));
+    },
     async getFanInfo({ commit }) {
       return await api
         .get('/redfish/v1/Chassis/chassis/Thermal')
diff --git a/src/store/modules/HardwareStatus/MemoryStore.js b/src/store/modules/HardwareStatus/MemoryStore.js
index fd8f0a91..358ca725 100644
--- a/src/store/modules/HardwareStatus/MemoryStore.js
+++ b/src/store/modules/HardwareStatus/MemoryStore.js
@@ -5,9 +5,11 @@ const MemoryStore = {
   namespaced: true,
   state: {
     dimms: [],
+    dimmsLastHour: [],
   },
   getters: {
     dimms: (state) => state.dimms,
+    dimmsLastHour: (state) => state.dimmsLastHour,
   },
   mutations: {
     setMemoryInfo: (state, data) => {
@@ -52,8 +54,36 @@ const MemoryStore = {
         };
       });
     },
+
+    setMemoryDynamic: (state, data) => {
+      state.dimms = data;
+    },
+
+    setMemoryDynamicLastHour: (state, data) => {
+      state.dimmsLastHour = data;
+    },
   },
   actions: {
+    async getMemoryDynamic({ commit }, { lastHour }) {
+      let url = null;
+      if (lastHour) {
+        url =
+          '/redfish/v1/TelemetryService/MetricReports/hour_data&id=dimm_temp&period=last_hour';
+      } else {
+        url =
+          '/redfish/v1/TelemetryService/MetricReports/hour_data&id=dimm_temp';
+      }
+      return await api
+        .get(url)
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setMemoryDynamicLastHour', MetricValues);
+          } else {
+            commit('setMemoryDynamic', MetricValues);
+          }
+        })
+        .catch((error) => console.log(error));
+    },
     async getDimms({ commit }) {
       return await api
         .get('/redfish/v1/Systems/system/Memory')
diff --git a/src/store/modules/HardwareStatus/MotherboardStore.js b/src/store/modules/HardwareStatus/MotherboardStore.js
new file mode 100644
index 00000000..7b2fe032
--- /dev/null
+++ b/src/store/modules/HardwareStatus/MotherboardStore.js
@@ -0,0 +1,45 @@
+import api from '@/store/api';
+
+const MotherboardStore = {
+  namespaced: true,
+  state: {
+    motherboard: [],
+    motherboardLastHour: [],
+  },
+  getters: {
+    motherboard: (state) => state.motherboard,
+    motherboardLastHour: (state) => state.motherboardLastHour,
+  },
+  mutations: {
+    setMotherboardDynamic: (state, data) => {
+      state.motherboard = data;
+    },
+    setMotherboardDynamicLastHour: (state, data) => {
+      state.motherboardLastHour = data;
+    },
+  },
+  actions: {
+    async getMotherboardDynamic({ commit }, { lastHour }) {
+      let url = null;
+      if (lastHour) {
+        url =
+          '/redfish/v1/TelemetryService/MetricReports/hour_data&id=other_temp&period=last_hour';
+      } else {
+        url =
+          '/redfish/v1/TelemetryService/MetricReports/hour_data&id=other_temp';
+      }
+      return await api
+        .get(url)
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setMotherboardDynamicLastHour', MetricValues);
+          } else {
+            commit('setMotherboardDynamic', MetricValues);
+          }
+        })
+        .catch((error) => console.log(error));
+    },
+  },
+};
+
+export default MotherboardStore;
diff --git a/src/store/modules/HardwareStatus/ProcessorStore.js b/src/store/modules/HardwareStatus/ProcessorStore.js
index d4c99bce..5466b85e 100644
--- a/src/store/modules/HardwareStatus/ProcessorStore.js
+++ b/src/store/modules/HardwareStatus/ProcessorStore.js
@@ -4,14 +4,20 @@ import i18n from '@/i18n';
 const ProcessorStore = {
   namespaced: true,
   state: {
-    processors: [],
+    cpuTemp: [],
+    cpuPower: [],
+    cpuTempLastHour: [],
+    cpuPowerLastHour: [],
   },
   getters: {
-    processors: (state) => state.processors,
+    cpuTemp: (state) => state.cpuTemp,
+    cpuPower: (state) => state.cpuPower,
+    cpuTempLastHour: (state) => state.cpuTempLastHour,
+    cpuPowerLastHour: (state) => state.cpuPowerLastHour,
   },
   mutations: {
     setProcessorsInfo: (state, data) => {
-      state.processors = data.map((processor) => {
+      state.cpuTemp = data.map((processor) => {
         const {
           Id,
           Status = {},
@@ -59,8 +65,60 @@ const ProcessorStore = {
         };
       });
     },
+
+    setCpuTempDynamic: (state, data) => {
+      state.cpuTemp = data;
+    },
+    setCpuPowerDynamic: (state, data) => {
+      state.cpuPower = data;
+    },
+    setCpuTempDynamicLastHour: (state, data) => {
+      state.cpuTempLastHour = data;
+    },
+    setCpuPowerDynamicLastHour: (state, data) => {
+      state.cpuPowerLastHour = data;
+    },
   },
   actions: {
+    async getCpuPowerDynamic({ commit }, { lastHour }) {
+      let url = null;
+      if (lastHour) {
+        url =
+          '/redfish/v1/TelemetryService/MetricReports/hour_data&id=power&period=last_hour';
+      } else {
+        url = '/redfish/v1/TelemetryService/MetricReports/hour_data&id=power';
+      }
+      return await api
+        .get(url)
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setCpuPowerDynamicLastHour', MetricValues);
+          } else {
+            commit('setCpuPowerDynamic', MetricValues);
+          }
+        })
+        .catch((error) => console.log(error));
+    },
+    async getCpuTempDynamic({ commit }, { lastHour }) {
+      let url = null;
+      if (lastHour) {
+        url =
+          '/redfish/v1/TelemetryService/MetricReports/hour_data&id=cpu_temp&period=last_hour';
+      } else {
+        url =
+          '/redfish/v1/TelemetryService/MetricReports/hour_data&id=cpu_temp';
+      }
+      return await api
+        .get(url)
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setCpuTempDynamicLastHour', MetricValues);
+          } else {
+            commit('setCpuTempDynamic', MetricValues);
+          }
+        })
+        .catch((error) => console.log(error));
+    },
     async getProcessorsInfo({ commit }) {
       return await api
         .get('/redfish/v1/Systems/system/Processors')