Skip to content

Commit 810deb0

Browse files
Patel-KamalkumarPatel-Kamalkumar
authored
Merge branch 'ibm-openbmc:1050' into ledchanges
2 parents 0c4673b + cd35234 commit 810deb0

32 files changed

+3275
-2557
lines changed

‎src/locales/en-US.json

+12-5
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
"locationCode": "Location Code",
459459
"name": "Name",
460460
"pelId": "Pel ID",
461+
"eventId": "Event ID",
461462
"settings": "Settings",
462463
"size": "Size in mebibytes"
463464
}
@@ -497,6 +498,7 @@
497498
"id": "Id",
498499
"name": "Name",
499500
"pelId": "Pel Id",
501+
"eventId": "Event ID",
500502
"reference": "Reference",
501503
"resource": "Resource",
502504
"severity": "Severity",
@@ -919,10 +921,6 @@
919921
"pageSystemParameters": {
920922
"aggressivePrefetch": "Aggressive prefetch",
921923
"aggressivePrefetchDescription": "Only change this value if instructed by service provider as it might degrade system performance. Specifies if processor favor aggressive prefetch is disabled or enabled",
922-
"alert": {
923-
"message": "System has to be powered off. Changes made will take effect on next reboot",
924-
"title": "Applying changes"
925-
},
926924
"button": {
927925
"saveSettings": "Save settings"
928926
},
@@ -931,12 +929,14 @@
931929
"frequencyCapHelpText": "If disabled, might require an initial boot to get the max and min frequency to be able to set.",
932930
"lateralCastOut": "Lateral cast out",
933931
"lateralCastOutDescription": "Only change this value if instructed by your service provider as it might degrade system performance.",
932+
"parametersInfo": "System has to be powered off. Changes made will take effect on next reboot.",
934933
"rpdPolicy": "Runtime processor diagnostic policy",
935934
"updateRpdPolicy": "Update RPD policy",
936935
"rpdPolicyDescription": "Enabled (Run on each core to test them on periodic basis), Scheduled (Run sequentially on each core at the scheduled time each day for the specified duration (in minutes)), Disabled (No diagnostics or exercisers will be run).",
937936
"rpdFeature": "Runtime processor diagnostic feature",
938937
"updateRpdFeature": "Update RPD feature",
939938
"rpdFeatureDescription": "Controls whether or not the Runtime Processor Diagnostics (RPD) Feature will be configured on the system. Enabled ( The RPD feature will be configured regardless of the amount of installed memory), Automatic (The RPD feature will be configured on systems with at least 128GB of installed memory and not configured on systems with less than 128GB), Disabled (The RPD feature will not be configured).",
939+
"rpdFeatureInfo": "Changes made to RPD feature requires a reboot to take effect but all other RPD parameters can be set dynamically at runtime.",
940940
"startTime": "Start time (24-hour time (UTC))",
941941
"runNow": "Run now",
942942
"duration": "Duration (minutes)",
@@ -1094,6 +1094,7 @@
10941094
"ipv6": "IPv6",
10951095
"ipv6AutoConfig": "IPv6 auto config",
10961096
"ipv6DefaultGateway": "IPv6 default gateway",
1097+
"ipv6StaticDefaultGateway": "IPv6 static default gateways",
10971098
"macAddress": "MAC address",
10981099
"network": "network",
10991100
"networkSettings": "Network settings",
@@ -1123,14 +1124,17 @@
11231124
"addDnsAddress": "Add IP address",
11241125
"addIpv4Address": "Add static IPv4 address",
11251126
"addIpv6Address": "Add static IPv6 address",
1127+
"addIpv6StaticDefaultGateway": "Add IPv6 static default gateway address",
11261128
"addressOrigin": "Address origin",
11271129
"addressState": "Address state",
11281130
"deleteDns": "Delete DNS address",
11291131
"deleteIpv4": "Delete IPv4 address",
11301132
"deleteIpv6": "Delete IPv6 address",
1133+
"deleteIpv6StaticDefaultGateway": "Delete IPv6 static default gateway address",
11311134
"editDns": "Edit DNS address",
11321135
"editIpv4": "Edit static IPv4 address",
11331136
"editIpv6": "Edit static IPv6 address",
1137+
"editIpv6StaticDefaultGateway": "Edit IPv6 static default gateway address",
11341138
"gateway": "Gateway",
11351139
"ipAddress": "IP address",
11361140
"prefixLength": "Prefix length",
@@ -1142,11 +1146,13 @@
11421146
"errorDeletingDnsServer": "Error deleting DNS server.",
11431147
"errorDeletingIpv4Server": "Error deleting IPv4 server.",
11441148
"errorDeletingIpv6Server": "Error deleting IPv6 server.",
1149+
"errorDeletingIpv6StaticDefaultGateway": "Error deleting IPv6 static default gateway.",
11451150
"successSaveNetworkSettings": "Successfully updated %{setting} settings.",
11461151
"successAddingDnsServer": "Successfully added DNS server.",
11471152
"successDeletingDnsServer": "Successfully deleted DNS server.",
11481153
"successDeletingIpv4Server": "Successfully deleted IPv4 server.",
1149-
"successDeletingIpv6Server": "Successfully deleted IPv6 server."
1154+
"successDeletingIpv6Server": "Successfully deleted IPv6 server.",
1155+
"successDeletingIpv6StaticDefaultGateway": "Successfully deleted IPv6 static default gateway."
11501156
}
11511157
},
11521158
"pageOverview": {
@@ -1482,6 +1488,7 @@
14821488
"pvm_system_operating_mode": "Server operating mode",
14831489
"pvm_system_power_off_policy": "Server power policy",
14841490
"selectedOperatingModeManual": "On save operating mode will be set to Manual",
1491+
"selectedOperatingModeNormal": "On save operating mode will be set to Normal",
14851492
"serverFirmware": "Server firmware start policy",
14861493
"powerSettingDescription": "View power setting descriptions",
14871494
"stayOn": "Stay On",

‎src/store/modules/HardwareStatus/PcieTopologyStore.js

+149-49
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ const PcieTopologyStore = {
247247
}
248248
if (
249249
chassisMembers[index].PCIeSlots.Slots[j].Links?.Oem?.IBM
250-
?.AssociatedAssembly.length > 0
250+
?.AssociatedAssembly
251251
) {
252252
let isAssemblySet = false;
253253
if (chassisInfo.length > 0) {
@@ -261,10 +261,12 @@ const PcieTopologyStore = {
261261
const oneSlot =
262262
oneChassis.detailedInfo.pcieSlots.eachSlot[y];
263263
if (
264+
chassisMembers[index].PCIeSlots.Slots[j].Links?.Oem?.IBM
265+
?.AssociatedAssembly &&
264266
oneSlot.associatedAssemblyLink &&
265267
oneSlot.associatedAssemblyLink ===
266268
chassisMembers[index].PCIeSlots.Slots[j].Links?.Oem
267-
.IBM.AssociatedAssembly[0]['@odata.id']
269+
?.IBM?.AssociatedAssembly['@odata.id']
268270
) {
269271
isAssemblySet = true;
270272
singleSlotData['associatedAssembly'] =
@@ -285,7 +287,7 @@ const PcieTopologyStore = {
285287
if (
286288
oneSlot?.associatedAssemblyLink ===
287289
chassisMembers[index].PCIeSlots.Slots[j].Links?.Oem.IBM
288-
.AssociatedAssembly[0]['@odata.id']
290+
.AssociatedAssembly['@odata.id']
289291
) {
290292
isAssemblySet = true;
291293
singleSlotData['associatedAssembly'] =
@@ -295,19 +297,23 @@ const PcieTopologyStore = {
295297
}
296298
}
297299
}
298-
if (!isAssemblySet) {
300+
if (
301+
chassisMembers[index]?.PCIeSlots?.Slots[j]?.Links?.Oem?.IBM
302+
?.AssociatedAssembly &&
303+
!isAssemblySet
304+
) {
299305
await api
300306
.get(
301-
chassisMembers[index].PCIeSlots.Slots[j].Links?.Oem.IBM
302-
.AssociatedAssembly[0]['@odata.id']
307+
chassisMembers[index]?.PCIeSlots?.Slots[j]?.Links?.Oem
308+
?.IBM?.AssociatedAssembly['@odata.id']
303309
)
304310
.then(async (assemblyResponse) => {
305311
singleSlotData['associatedAssembly'] =
306312
assemblyResponse.data;
307313
singleSlotData['associatedAssemblyLink'] =
308314
chassisMembers[index].PCIeSlots.Slots[
309315
j
310-
].Links?.Oem?.IBM?.AssociatedAssembly[0]['@odata.id'];
316+
].Links?.Oem?.IBM?.AssociatedAssembly['@odata.id'];
311317
})
312318
.catch((error) => {
313319
console.log('error', error);
@@ -654,6 +660,7 @@ const PcieTopologyStore = {
654660
) {
655661
cablesData.detailedInfo.downstreamPorts.push({
656662
data: dspPorts[p],
663+
grandParent: dspRes.data,
657664
grandParentLocation:
658665
dspRes.data?.Location?.PartLocation?.ServiceLabel,
659666
});
@@ -785,72 +792,122 @@ const PcieTopologyStore = {
785792
}
786793
cablesInfo.map((cable) => {
787794
if (cable.detailedInfo?.downstreamResources?.length > 0) {
795+
cable.detailedInfo.downstreamResources[0].pcieSlots.map(
796+
(chaSlot) => {
797+
if (
798+
chaSlot.data?.Oem?.IBM?.LinkId === row.linkId &&
799+
chaSlot.data.Links?.Oem?.IBM?.AssociatedAssembly &&
800+
chaSlot.data.Links?.Oem?.IBM?.AssociatedAssembly[
801+
'@odata.id'
802+
] === cable.detailedInfo.downstreamResourcesUri
803+
) {
804+
for (
805+
let i = 0;
806+
i <
807+
cable.detailedInfo?.grandParentInfo?.expanderSlots
808+
?.length;
809+
i++
810+
) {
811+
const expanderSlot =
812+
cable.detailedInfo?.grandParentInfo?.expanderSlots[i];
813+
if (
814+
cable.detailedInfo.grandParentInfo.data?.Links
815+
?.PCIeDevices[0]['@odata.id'] ===
816+
expanderSlot.Links?.PCIeDevice[0]['@odata.id']
817+
) {
818+
row['linkType'] = 'Secondary';
819+
row['parentLinkId'] = expanderSlot.Oem?.IBM?.LinkId;
820+
break;
821+
}
822+
}
823+
}
824+
}
825+
);
826+
}
827+
if (cable.detailedInfo.downstreamChassis.length > 0) {
828+
const downstream_device =
829+
cable.detailedInfo.downstreamPorts[0].grandParent;
788830
if (
789-
slot.associatedAssemblyLink ===
790-
cable.detailedInfo.downstreamResourcesUri
831+
slot?.data.Links.PCIeDevice[0]['@odata.id'] ===
832+
downstream_device.Links?.PCIeDevices[0]['@odata.id']
791833
) {
792834
for (
793835
let i = 0;
794-
i <
795-
cable.detailedInfo?.grandParentInfo?.expanderSlots?.length;
836+
i < cable.detailedInfo.grandParentInfo.expanderSlots.length;
796837
i++
797838
) {
798839
const expanderSlot =
799-
cable.detailedInfo?.grandParentInfo?.expanderSlots[i];
800-
row['linkType'] = 'Secondary';
801-
row['parentLinkId'] = expanderSlot.Oem?.IBM?.LinkId;
802-
break;
803-
}
804-
}
805-
}
806-
if (cable.detailedInfo.downstreamChassis.length > 0) {
807-
cable.detailedInfo.downstreamChassis[0].pcieSlots.map(
808-
(singleSlot) => {
840+
cable.detailedInfo.grandParentInfo.expanderSlots[i];
809841
if (
810-
slot?.pcieDeviceLink ===
811-
singleSlot.data?.Links?.PCIeDevice[0]['@odata.id']
842+
cable.detailedInfo.grandParentInfo.data.Links
843+
?.PCIeDevices[0]['@odata.id'] ===
844+
expanderSlot.Links?.PCIeDevice[0]['@odata.id']
812845
) {
813-
for (
814-
let i = 0;
815-
i <
816-
cable.detailedInfo.grandParentInfo.expanderSlots.length;
817-
i++
846+
row['linkType'] = 'Secondary';
847+
if (
848+
expanderSlot?.Links?.Processors &&
849+
expanderSlot?.Links?.Processors.length > 0
818850
) {
819-
const expanderSlot =
820-
cable.detailedInfo.grandParentInfo.expanderSlots[i];
821-
row['linkType'] = 'Secondary';
822-
row['parentLinkId'] = expanderSlot.Oem?.IBM?.LinkId;
823-
break;
851+
procMembers.map((proc) => {
852+
if (
853+
proc['@odata.id'] ===
854+
expanderSlot.Links?.Processors[0]['@odata.id']
855+
) {
856+
row.pcieHBLocation = {
857+
locationIndicatorActive:
858+
proc?.LocationIndicatorActive,
859+
locationNumber:
860+
proc?.Location?.PartLocation?.ServiceLabel,
861+
uri: proc['@odata.id'],
862+
};
863+
}
864+
});
824865
}
866+
row['parentLinkId'] = expanderSlot.Oem?.IBM?.LinkId;
867+
break;
825868
}
826869
}
827-
);
870+
}
828871
}
829-
if (cable.detailedInfo.upstreamPorts.length > 0) {
872+
if (
873+
cable?.detailedInfo?.upstreamPorts?.length > 0 ||
874+
cable?.detailedInfo?.downstreamPorts?.length > 0
875+
) {
830876
fabricAdapterInfo.map((adapter) => {
831877
if (
832878
adapter?.pcieDeviceLink &&
833879
adapter.pcieDeviceLink === slot.pcieDeviceLink
834880
) {
835881
if (
836-
cable.detailedInfo.upstreamPorts[0][
837-
'@odata.id'
838-
].startsWith(adapter.data['@odata.id'])
882+
(cable?.detailedInfo?.upstreamPorts.length > 0 &&
883+
cable?.detailedInfo?.upstreamPorts[0][
884+
'@odata.id'
885+
].startsWith(adapter.data['@odata.id'])) ||
886+
(cable?.detailedInfo?.downstreamPorts.length > 0 &&
887+
cable?.detailedInfo?.downstreamPorts[0].data[
888+
'@odata.id'
889+
].startsWith(adapter.data['@odata.id']))
839890
) {
840891
if (cable.detailedInfo.downstreamResources.length > 0) {
841892
row.ioSlotLocation = [];
842893
cable.detailedInfo.downstreamResources[0].pcieSlots.map(
843894
(slot2) => {
844895
if (
845-
slot2.Links?.Oem?.IBM?.AssociatedAssembly ===
846-
cable.detailedInfo.downstreamResourcesUri
896+
slot2?.data?.Links?.Oem?.IBM
897+
?.AssociatedAssembly &&
898+
slot2?.data?.Links?.Oem?.IBM?.AssociatedAssembly[
899+
'@odata.id'
900+
] === cable.detailedInfo.downstreamResourcesUri
847901
) {
848-
if (slot2?.Location?.PartLocation?.ServiceLabel) {
902+
if (
903+
slot2?.data?.Location?.PartLocation
904+
?.ServiceLabel
905+
) {
849906
const duplicate = row.ioSlotLocation.find(
850907
(obj) => {
851908
if (
852909
obj.locationNumber ===
853-
slot2?.Location?.PartLocation
910+
slot2?.data.Location?.PartLocation
854911
?.ServiceLabel
855912
) {
856913
return true;
@@ -860,9 +917,9 @@ const PcieTopologyStore = {
860917
if (duplicate === undefined) {
861918
row.ioSlotLocation.push({
862919
locationIndicatorActive:
863-
slot2?.LocationIndicatorActive,
920+
slot2?.data.LocationIndicatorActive,
864921
locationNumber:
865-
slot2?.Location?.PartLocation
922+
slot2?.data.Location?.PartLocation
866923
?.ServiceLabel,
867924
uri:
868925
cable.detailedInfo.downstreamResources[0]
@@ -880,13 +937,14 @@ const PcieTopologyStore = {
880937
cable.detailedInfo.downstreamChassis[0].pcieSlots.map(
881938
(dsSlot) => {
882939
if (
883-
dsSlot?.data?.Location?.PartLocation?.ServiceLabel
940+
dsSlot?.data?.Links?.Oem?.IBM
941+
?.UpstreamFabricAdapter
884942
) {
885943
if (
886-
dsSlot?.data?.Location?.PartLocation?.ServiceLabel.startsWith(
887-
cable.detailedInfo?.downstreamPorts[0]
888-
?.grandParentLocation
889-
)
944+
dsSlot?.data?.Links?.Oem?.IBM
945+
?.UpstreamFabricAdapter['@odata.id'] ===
946+
cable.detailedInfo?.downstreamPorts[0]
947+
?.grandParent['@odata.id']
890948
) {
891949
const duplicate = row.ioSlotLocation.find(
892950
(obj) => {
@@ -977,6 +1035,48 @@ const PcieTopologyStore = {
9771035
});
9781036
}
9791037
});
1038+
fabricAdapterInfo.map((adapter) => {
1039+
const pcie_device =
1040+
adapter.data.Links?.PCIeDevices[0]['@odata.id'];
1041+
pcieDeviceMembers.map((device) => {
1042+
if (device['@odata.id'] === pcie_device) {
1043+
const expander_slots =
1044+
device.Links?.Oem?.IBM?.PCIeSlot['@odata.id'];
1045+
chassisInfo.map((chassisValue) => {
1046+
if (
1047+
chassisValue.detailedInfo.pcieSlotsUri === expander_slots
1048+
) {
1049+
chassisValue.detailedInfo.pcieSlots.data.Slots.map(
1050+
(slot2) => {
1051+
if (
1052+
slot2.Links?.PCIeDevice[0]['@odata.id'] ===
1053+
pcie_device
1054+
) {
1055+
if (
1056+
slot.data?.Links?.Oem?.IBM
1057+
?.UpstreamFabricAdapter &&
1058+
slot.data?.Links?.Oem?.IBM?.UpstreamFabricAdapter[
1059+
'@odata.id'
1060+
] === adapter.data['@odata.id']
1061+
) {
1062+
row['linkType'] = 'Secondary';
1063+
row['parentLinkId'] = slot2.Oem?.IBM?.LinkId;
1064+
rows.map((singleRow) => {
1065+
if (
1066+
singleRow.linkId === slot2.Oem?.IBM?.LinkId
1067+
) {
1068+
row.pcieHBLocation = singleRow.pcieHBLocation;
1069+
}
1070+
});
1071+
}
1072+
}
1073+
}
1074+
);
1075+
}
1076+
});
1077+
}
1078+
});
1079+
});
9801080
rows.push(row);
9811081
commit('setEntries', rows);
9821082
}

0 commit comments

Comments
 (0)