matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Support multiple pcie configuration file and change the pcie status table name to match with pcied changes (#7886)

Browse Source 
Why I did it
Support multiple pcie configuration file and change the pcie status table name
This is to match with below two PRs.
Azure/sonic-platform-common#195
Azure/sonic-platform-daemons#189

How I did it
Check pcie configuration file with wild card and change the device status table name

How to verify it
Restart with changes and see if the pcie check works as expected.
This commit is contained in:
Sujin Kang 2021-06-16 16:05:48 -07:00 committed by GitHub
parent 3d629233bf
commit ecc5073731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
files/image_config/pcie-check/pcie-check.sh
View File

@ -5,6 +5,7 @@ VERBOSE="no"
RESULTS="PCIe Device Checking All Test"
EXPECTED="PCIe Device Checking All Test ----------->>> PASSED"
MAX_WAIT_SECONDS=15
PCIE_STATUS_TABLE="PCIE_DEVICES|status"
function debug()
{
@ -19,7 +20,7 @@ function check_and_rescan_pcie_devices()
PCIE_CHK_CMD='sudo pcieutil check | grep "$RESULTS"'
PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
if [ ! -f /usr/share/sonic/device/$PLATFORM/pcie.yaml ]; then
if [ ! -f /usr/share/sonic/device/$PLATFORM/pcie*.yaml ]; then
debug "pcie.yaml does not exist! Can't check PCIe status!"
exit
fi
@ -37,7 +38,7 @@ function check_and_rescan_pcie_devices()
fi
if [ "$(eval $PCIE_CHK_CMD)" = "$EXPECTED" ]; then
redis-cli -n 6 HSET "PCIE_DEVICES" "status" "PASSED"
redis-cli -n 6 HSET $PCIE_STATUS_TABLE "status" "PASSED"
debug "PCIe check passed"
exit
else
@ -53,7 +54,7 @@ function check_and_rescan_pcie_devices()
done
debug "PCIe check failed"
redis-cli -n 6 HSET "PCIE_DEVICES" "status" "FAILED"
redis-cli -n 6 HSET $PCIE_STATUS_TABLE "status" "FAILED"
}
check_and_rescan_pcie_devices