Skip to content

Commit da10ffe

Browse files
committed
Fixed Expander slots in PCIe topology
- Fixed expander slots in PCIe topology page. Signed-off-by: Nikhil Ashoka <[email protected]>
1 parent 8cb6ea3 commit da10ffe

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

src/store/modules/HardwareStatus/PcieTopologyStore.js

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const PcieTopologyStore = {
111111
singleSlotData['data'] = chassisMembers[index].PCIeSlots.Slots[j];
112112
if (
113113
chassisMembers[index].PCIeSlots.Slots[j].Links?.PCIeDevice
114-
.length > 0
114+
?.length > 0
115115
) {
116116
let isLinkSet = false;
117117
if (chassisInfo.length > 0) {
@@ -129,7 +129,7 @@ const PcieTopologyStore = {
129129
oneSlot.pcieDeviceLink &&
130130
oneSlot.pcieDeviceLink ===
131131
chassisMembers[index].PCIeSlots.Slots[j].Links
132-
?.PCIeDevice[0]['@odata.id']
132+
?.PCIeDevice?.[0]?.['@odata.id']
133133
) {
134134
isLinkSet = true;
135135
singleSlotData['pcieDevice'] = oneSlot.pcieDevice;
@@ -152,7 +152,7 @@ const PcieTopologyStore = {
152152
oneSlot.pcieDeviceLink &&
153153
oneSlot.pcieDeviceLink ===
154154
chassisMembers[index].PCIeSlots.Slots[j].Links
155-
?.PCIeDevice[0]['@odata.id']
155+
?.PCIeDevice?.[0]?.['@odata.id']
156156
) {
157157
isLinkSet = true;
158158
singleSlotData['pcieDevice'] = oneSlot.pcieDevice;
@@ -166,13 +166,13 @@ const PcieTopologyStore = {
166166
if (
167167
singleDevice['@odata.id'] ===
168168
chassisMembers[index].PCIeSlots.Slots[j].Links
169-
?.PCIeDevice[0]['@odata.id']
169+
?.PCIeDevice?.[0]?.['@odata.id']
170170
) {
171171
singleSlotData['pcieDevice'] = singleDevice;
172172
singleSlotData['pcieDeviceLink'] =
173173
chassisMembers[index].PCIeSlots.Slots[
174174
j
175-
].Links?.PCIeDevice[0]['@odata.id'];
175+
].Links?.PCIeDevice?.[0]?.['@odata.id'];
176176
}
177177
});
178178
}
@@ -722,7 +722,7 @@ const PcieTopologyStore = {
722722
if (slot.data.Oem?.IBM?.LinkId !== 0) {
723723
let row = {};
724724
row.linkId = slot.data.Oem?.IBM?.LinkId;
725-
row.resetLinkUri = slot.data.Links?.PCIeDevice[0]['@odata.id'];
725+
row.resetLinkUri = slot.data.Links?.PCIeDevice?.[0]?.['@odata.id'];
726726
if (chassisInfo.length > 0) {
727727
chassisInfo.map((oneChassis) => {
728728
oneChassis.detailedInfo.pcieSlots.eachSlot.map((oneSlot) => {
@@ -852,10 +852,13 @@ const PcieTopologyStore = {
852852
if (
853853
cable.detailedInfo.grandParentInfo.data?.Links
854854
?.PCIeDevices[0]['@odata.id'] ===
855-
expanderSlot.Links?.PCIeDevice[0]['@odata.id']
855+
expanderSlot?.data?.Links?.PCIeDevice?.[0]?.[
856+
'@odata.id'
857+
]
856858
) {
857859
row['linkType'] = 'Secondary';
858-
row['parentLinkId'] = expanderSlot.Oem?.IBM?.LinkId;
860+
row['parentLinkId'] =
861+
expanderSlot?.data?.Oem?.IBM?.LinkId;
859862
break;
860863
}
861864
}
@@ -867,7 +870,7 @@ const PcieTopologyStore = {
867870
const downstream_device =
868871
cable.detailedInfo.downstreamPorts[0].grandParent;
869872
if (
870-
slot?.data.Links.PCIeDevice[0]['@odata.id'] ===
873+
slot?.data.Links.PCIeDevice?.[0]?.['@odata.id'] ===
871874
downstream_device.Links?.PCIeDevices[0]['@odata.id']
872875
) {
873876
for (
@@ -880,12 +883,12 @@ const PcieTopologyStore = {
880883
if (
881884
cable.detailedInfo.grandParentInfo.data.Links
882885
?.PCIeDevices[0]['@odata.id'] ===
883-
expanderSlot.Links?.PCIeDevice[0]['@odata.id']
886+
expanderSlot?.data?.Links?.PCIeDevice?.[0]?.['@odata.id']
884887
) {
885888
row['linkType'] = 'Secondary';
886889
if (
887-
expanderSlot?.Links?.Processors &&
888-
expanderSlot?.Links?.Processors.length > 0
890+
expanderSlot?.data?.Links?.Processors &&
891+
expanderSlot?.data?.Links?.Processors.length > 0
889892
) {
890893
procMembers.map((proc) => {
891894
if (
@@ -902,7 +905,8 @@ const PcieTopologyStore = {
902905
}
903906
});
904907
}
905-
row['parentLinkId'] = expanderSlot.Oem?.IBM?.LinkId;
908+
row['parentLinkId'] =
909+
expanderSlot?.data?.Oem?.IBM?.LinkId;
906910
break;
907911
}
908912
}
@@ -1108,7 +1112,7 @@ const PcieTopologyStore = {
11081112
chassisValue.detailedInfo.pcieSlots.data.Slots.map(
11091113
(slot2) => {
11101114
if (
1111-
slot2.Links?.PCIeDevice[0]['@odata.id'] ===
1115+
slot2.Links?.PCIeDevice?.[0]?.['@odata.id'] ===
11121116
pcie_device
11131117
) {
11141118
if (

0 commit comments

Comments
 (0)