From 223fe5b50ee91e95bb3d19b4ae379b99a86eb570 Mon Sep 17 00:00:00 2001
From: Tan Siewert <tan@siewert.io>
Date: Fri, 17 Jan 2025 19:47:28 +0100
Subject: [PATCH] inventory: move serial console to system

SerialConsole was deprecated in Manager v1_10_0 and has been
removed in bmcweb [1].

Because the SerialConsole values were not available anymore, the
Managers were not displayed because "setBmcInfo" couldn't find the
"SerialConsole" properties. THe following error will be logged:

```
TypeError: Cannot read properties of undefined (reading 'ConnectTypesSupported')
    at Wa.setBmcInfo (app.25e72670.js:58:745295)
    at app.25e72670.js:50:2774
    at app.25e72670.js:50:10113
    at Array.forEach (<anonymous>)
    at app.25e72670.js:50:10092
    at Wa._withCommit (app.25e72670.js:50:11953)
    at Wa.commit (app.25e72670.js:50:10066)
    at Wa.commit (app.25e72670.js:50:9518)
    at o.commit (app.25e72670.js:50:2216)
    at app.25e72670.js:58:745747
```

[1]: https://github.com/openbmc/bmcweb/commit/fa800c8a141aa4b209269e0fb50cae34aa24f75d

Tested: BMC manager being listed in the inventory and serial console
        variables being displayed for the system.

Change-Id: I1a24178717805ca50eef2c89042c0bd9ede1d5bc
Signed-off-by: Tan Siewert <tan@siewert.io>
---
 src/store/modules/HardwareStatus/BmcStore.js       |  3 ---
 src/store/modules/HardwareStatus/SystemStore.js    |  3 +++
 .../Inventory/InventoryTableBmcManager.vue         | 14 --------------
 .../Inventory/InventoryTableSystem.vue             | 10 ++++++++++
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/store/modules/HardwareStatus/BmcStore.js b/src/store/modules/HardwareStatus/BmcStore.js
index c6de412eb9..a4c77cb9d3 100644
--- a/src/store/modules/HardwareStatus/BmcStore.js
+++ b/src/store/modules/HardwareStatus/BmcStore.js
@@ -32,9 +32,6 @@ const BmcStore = {
       bmc.name = data.Name;
       bmc.partNumber = data.PartNumber;
       bmc.powerState = data.PowerState;
-      bmc.serialConsoleConnectTypes = data.SerialConsole.ConnectTypesSupported;
-      bmc.serialConsoleEnabled = data.SerialConsole.ServiceEnabled;
-      bmc.serialConsoleMaxSessions = data.SerialConsole.MaxConcurrentSessions;
       bmc.serialNumber = data.SerialNumber;
       bmc.serviceEntryPointUuid = data.ServiceEntryPointUUID;
       bmc.sparePartNumber = data.SparePartNumber;
diff --git a/src/store/modules/HardwareStatus/SystemStore.js b/src/store/modules/HardwareStatus/SystemStore.js
index 50c8b6f7d7..7fbd6bc412 100644
--- a/src/store/modules/HardwareStatus/SystemStore.js
+++ b/src/store/modules/HardwareStatus/SystemStore.js
@@ -27,6 +27,9 @@ const SystemStore = {
       system.processorSummaryCoreCount = data.ProcessorSummary?.CoreCount;
       system.powerState = data.PowerState;
       system.serialNumber = data.SerialNumber;
+      system.serialConsoleEnabled = data.SerialConsole.ServiceEnabled;
+      system.serialConsoleMaxSessions =
+        data.SerialConsole.MaxConcurrentSessions;
       system.healthRollup = data.Status?.HealthRollup;
       system.subModel = data.SubModel;
       system.statusState = data.Status?.State;
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
index 848322c057..4ee4eba161 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
@@ -139,20 +139,6 @@
                   {{ dataFormatter(item.graphicalConsoleEnabled) }}
                 </dd>
               </dl>
-              <!-- Serial console -->
-              <p class="mt-1 mb-2 h6 float-none m-0">
-                {{ $t('pageInventory.table.serialConsole') }}
-              </p>
-              <dl class="ml-4">
-                <dt>{{ $t('pageInventory.table.connectTypesSupported') }}:</dt>
-                <dd>
-                  {{ dataFormatterArray(item.serialConsoleConnectTypes) }}
-                </dd>
-                <dt>{{ $t('pageInventory.table.maxConcurrentSessions') }}:</dt>
-                <dd>{{ dataFormatter(item.serialConsoleMaxSessions) }}</dd>
-                <dt>{{ $t('pageInventory.table.serviceEnabled') }}:</dt>
-                <dd>{{ dataFormatter(item.serialConsoleEnabled) }}</dd>
-              </dl>
             </b-col>
           </b-row>
         </b-container>
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
index 2839c788a2..23beb47a20 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
@@ -123,6 +123,16 @@
                 <dt>{{ $t('pageInventory.table.coreCount') }}:</dt>
                 <dd>{{ dataFormatter(item.processorSummaryCoreCount) }}</dd>
               </dl>
+              <!-- Serial console -->
+              <p class="mt-1 mb-2 h6 float-none m-0">
+                {{ $t('pageInventory.table.serialConsole') }}
+              </p>
+              <dl class="ml-4">
+                <dt>{{ $t('pageInventory.table.maxConcurrentSessions') }}:</dt>
+                <dd>{{ dataFormatter(item.serialConsoleMaxSessions) }}</dd>
+                <dt>{{ $t('pageInventory.table.serviceEnabled') }}:</dt>
+                <dd>{{ dataFormatter(item.serialConsoleEnabled) }}</dd>
+              </dl>
             </b-col>
           </b-row>
         </b-container>