Skip to content

Commit 9d22e6d

Browse files
[ES9618XX] Use platform.json for ASIC sensor polling configuration
With the enhancement introduced in PR sonic-net#20826 - "[asic_sensors] Generate the ASIC sensor polling configuration based on the platform.json" - we can now define ASIC sensor polling settings directly in platform.json. This change removes the need for a custom.json override and simplifies platform-specific configuration by centralizing the polling interval and status settings under platform.json. Signed-off-by: Michael Zaidman <[email protected]>
1 parent 58fc0dc commit 9d22e6d

3 files changed

Lines changed: 4 additions & 20 deletions

File tree

device/accton/x86_64-accton_es9618xx-r0/custom.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

device/accton/x86_64-accton_es9618xx-r0/platform.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,5 +683,9 @@
683683
"8x100G": ["Eth16/1", "Eth16/2", "Eth16/3", "Eth16/4", "Eth16/5", "Eth16/6", "Eth16/7", "Eth16/8"]
684684
}
685685
}
686+
},
687+
"asic_sensors": {
688+
"poll_interval": "10",
689+
"poll_admin_status": "enable"
686690
}
687691
}

platform/xsight/files/xlx/start.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@ XSIGHT_PCI_ID=""
2020
XSIGHT_DEVICE=""
2121
FIRSTBOOT="/tmp/notify_firstboot_to_platform"
2222

23-
if [ -f $FIRSTBOOT ]; then
24-
PLATFORM=$(sed -n 's/onie_platform=\(.*\)/\1/p' /host/machine.conf)
25-
26-
# update default config from custom.json
27-
if [ -f /usr/share/sonic/device/$PLATFORM/custom.json ]; then
28-
sonic-cfggen --from-db -j /usr/share/sonic/device/$PLATFORM/custom.json --print-data > /etc/sonic/config_db.json
29-
sonic-cfggen -j /usr/share/sonic/device/$PLATFORM/custom.json --write-to-db
30-
fi
31-
fi
32-
3323
fname=$(basename $0)
3424

3525
# The eth0 interface intermittently disappears on reboot.

0 commit comments

Comments
 (0)