Skip to content

Commit 223fe5b

Browse files
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]: openbmc/bmcweb@fa800c8 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 <[email protected]>
1 parent a6becfe commit 223fe5b

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

src/store/modules/HardwareStatus/BmcStore.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ const BmcStore = {
3232
bmc.name = data.Name;
3333
bmc.partNumber = data.PartNumber;
3434
bmc.powerState = data.PowerState;
35-
bmc.serialConsoleConnectTypes = data.SerialConsole.ConnectTypesSupported;
36-
bmc.serialConsoleEnabled = data.SerialConsole.ServiceEnabled;
37-
bmc.serialConsoleMaxSessions = data.SerialConsole.MaxConcurrentSessions;
3835
bmc.serialNumber = data.SerialNumber;
3936
bmc.serviceEntryPointUuid = data.ServiceEntryPointUUID;
4037
bmc.sparePartNumber = data.SparePartNumber;

src/store/modules/HardwareStatus/SystemStore.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ const SystemStore = {
2727
system.processorSummaryCoreCount = data.ProcessorSummary?.CoreCount;
2828
system.powerState = data.PowerState;
2929
system.serialNumber = data.SerialNumber;
30+
system.serialConsoleEnabled = data.SerialConsole.ServiceEnabled;
31+
system.serialConsoleMaxSessions =
32+
data.SerialConsole.MaxConcurrentSessions;
3033
system.healthRollup = data.Status?.HealthRollup;
3134
system.subModel = data.SubModel;
3235
system.statusState = data.Status?.State;

src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,6 @@
139139
{{ dataFormatter(item.graphicalConsoleEnabled) }}
140140
</dd>
141141
</dl>
142-
<!-- Serial console -->
143-
<p class="mt-1 mb-2 h6 float-none m-0">
144-
{{ $t('pageInventory.table.serialConsole') }}
145-
</p>
146-
<dl class="ml-4">
147-
<dt>{{ $t('pageInventory.table.connectTypesSupported') }}:</dt>
148-
<dd>
149-
{{ dataFormatterArray(item.serialConsoleConnectTypes) }}
150-
</dd>
151-
<dt>{{ $t('pageInventory.table.maxConcurrentSessions') }}:</dt>
152-
<dd>{{ dataFormatter(item.serialConsoleMaxSessions) }}</dd>
153-
<dt>{{ $t('pageInventory.table.serviceEnabled') }}:</dt>
154-
<dd>{{ dataFormatter(item.serialConsoleEnabled) }}</dd>
155-
</dl>
156142
</b-col>
157143
</b-row>
158144
</b-container>

src/views/HardwareStatus/Inventory/InventoryTableSystem.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,16 @@
123123
<dt>{{ $t('pageInventory.table.coreCount') }}:</dt>
124124
<dd>{{ dataFormatter(item.processorSummaryCoreCount) }}</dd>
125125
</dl>
126+
<!-- Serial console -->
127+
<p class="mt-1 mb-2 h6 float-none m-0">
128+
{{ $t('pageInventory.table.serialConsole') }}
129+
</p>
130+
<dl class="ml-4">
131+
<dt>{{ $t('pageInventory.table.maxConcurrentSessions') }}:</dt>
132+
<dd>{{ dataFormatter(item.serialConsoleMaxSessions) }}</dd>
133+
<dt>{{ $t('pageInventory.table.serviceEnabled') }}:</dt>
134+
<dd>{{ dataFormatter(item.serialConsoleEnabled) }}</dd>
135+
</dl>
126136
</b-col>
127137
</b-row>
128138
</b-container>

0 commit comments

Comments
 (0)