[pcie.yaml] Move pcie configuration file path to platform directory (s…

…onic-net#6475) - Why I did it The pcie configuration file location is under plugin directory not under platform directory. sonic-net#6437 - How I did it Move all pcie.yaml configuration file from plugin to platform directory. Remove unnecessary timer to start pcie-check.service Move pcie-check.service to sonic-host-services - How to verify it Verify on the device
lolyu · Mar 3, 2021 · edd7fa1 · edd7fa1
1 parent 1ef1736
commit edd7fa1
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,13 @@ platform/**/*-none-any.whl
 platform/**/.pybuild
 platform/**/debian/*
 platform/**/build
+platform/**/*.ko
+platform/**/*.mod.c
+platform/**/*.mod.o
+platform/**/*.o
+platform/**/*.d
+platform/**/*.cmd
+platform/**/*.order
 platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/ipmihelper.py
 platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_ich.c
 platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c

diff --git a/...86_64-arista_7050_qx32s/plugins/pcie.yaml → ...arista/x86_64-arista_7050_qx32s/pcie.yaml b/...86_64-arista_7050_qx32s/plugins/pcie.yaml → ...arista/x86_64-arista_7050_qx32s/pcie.yaml
diff --git a/...6_64-arista_7050cx3_32s/plugins/pcie.yaml → ...rista/x86_64-arista_7050cx3_32s/pcie.yaml b/...6_64-arista_7050cx3_32s/plugins/pcie.yaml → ...rista/x86_64-arista_7050cx3_32s/pcie.yaml
diff --git a/...86_64-arista_7060_cx32s/plugins/pcie.yaml → ...arista/x86_64-arista_7060_cx32s/pcie.yaml b/...86_64-arista_7060_cx32s/plugins/pcie.yaml → ...arista/x86_64-arista_7060_cx32s/pcie.yaml
diff --git a/...86_64-arista_7260cx3_64/plugins/pcie.yaml → ...arista/x86_64-arista_7260cx3_64/pcie.yaml b/...86_64-arista_7260cx3_64/plugins/pcie.yaml → ...arista/x86_64-arista_7260cx3_64/pcie.yaml
diff --git a/...ica/x86_64-cel_e1031-r0/plugins/pcie.yaml → ...e/celestica/x86_64-cel_e1031-r0/pcie.yaml b/...ica/x86_64-cel_e1031-r0/plugins/pcie.yaml → ...e/celestica/x86_64-cel_e1031-r0/pcie.yaml
diff --git a/.../x86_64-cel_seastone-r0/plugins/pcie.yaml → ...elestica/x86_64-cel_seastone-r0/pcie.yaml b/.../x86_64-cel_seastone-r0/plugins/pcie.yaml → ...elestica/x86_64-cel_seastone-r0/pcie.yaml
diff --git a/..._64-dell_s6000_s1220-r0/plugins/pcie.yaml → ...dell/x86_64-dell_s6000_s1220-r0/pcie.yaml b/..._64-dell_s6000_s1220-r0/plugins/pcie.yaml → ...dell/x86_64-dell_s6000_s1220-r0/pcie.yaml
diff --git a/..._64-dell_s6100_c2538-r0/plugins/pcie.yaml → ...dell/x86_64-dell_s6100_c2538-r0/pcie.yaml b/..._64-dell_s6100_c2538-r0/plugins/pcie.yaml → ...dell/x86_64-dell_s6100_c2538-r0/pcie.yaml
diff --git a/files/build_templates/pcie-check.timer b/files/build_templates/pcie-check.timer
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -506,10 +506,6 @@ sudo cp $IMAGE_CONFIGS/constants/constants.yml $FILESYSTEM_ROOT/etc/sonic/
 sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/
 sudo cp $IMAGE_CONFIGS/sudoers/sudoers.lecture $FILESYSTEM_ROOT/etc/
 
-# Copy systemd timer configuration
-sudo cp $BUILD_TEMPLATES/pcie-check.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
-sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable pcie-check.timer
-
 # Copy pcie-check service files
 sudo cp $IMAGE_CONFIGS/pcie-check/pcie-check.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
 echo "pcie-check.service" | sudo tee -a $GENERATED_SERVICE_FILE

diff --git a/files/image_config/pcie-check/pcie-check.service b/files/image_config/pcie-check/pcie-check.service
@@ -5,3 +5,6 @@ After=rc.local.service database.service
 [Service]
 Type=simple
 ExecStart=/usr/bin/pcie-check.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/image_config/pcie-check/pcie-check.sh b/files/image_config/pcie-check/pcie-check.sh
@@ -19,7 +19,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/plugins/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

diff --git a/...orm-modules-bfn-montara/plugins/pcie.yaml → ...ic-platform-modules-bfn-montara/pcie.yaml b/...orm-modules-bfn-montara/plugins/pcie.yaml → ...ic-platform-modules-bfn-montara/pcie.yaml
diff --git a/...orm-modules-bfn-newport/plugins/pcie.yaml → ...ic-platform-modules-bfn-newport/pcie.yaml b/...orm-modules-bfn-newport/plugins/pcie.yaml → ...ic-platform-modules-bfn-newport/pcie.yaml