Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

201911 cel dev #200

Closed
wants to merge 109 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
12fb95c
[201911][sonic-platform-common]: Advance submodule (#4635)
nazariig May 23, 2020
16d9fc8
Fix vrf test failed after frr update to 7.2 (#3763)
Nov 19, 2019
3ca65bd
[Mellanox] Fix 'sensors.conf' mapping for MSN4700 (#4511)
shlomibitton May 7, 2020
98b8d1e
DellEMC: get_change_event Platform API implementation for S6000, S610…
ArunSaravananBalachandran May 20, 2020
5969470
[sonic-slave]: Install pympler to find the memory leaks in python (#4…
pavel-shirshov May 27, 2020
a693f02
Read cloudtype info from minigraph (#4642)
sumukhatv May 26, 2020
618d529
[201911][Mellanox] Update hw-mgmt package to V.7.0010.1000 (#4688)
keboliu Jun 2, 2020
e3e5dd4
Merge pull request #2 from SONIC-DEV/201911_cel_dev
Alex-Dai Jun 3, 2020
ac957a0
[caclmgrd] Add some default ACCEPT rules and lastly drop all incoming…
jleveque May 11, 2020
1e59be8
[caclmgrd] Ignore keys in interface-related tables if no IP prefix is…
jleveque May 13, 2020
f2c0ed8
[caclmgrd] Allow more ICMP types (#4625)
jleveque May 21, 2020
e00d038
[sonic-slave]: add debian packages needed to compile BRCM SAI3.7 (#4672)
abdosi May 30, 2020
913d380
[caclmgrd] Get first VLAN host IP address via next() (#4685)
jleveque Jun 2, 2020
0de051a
[DellEmc] Changes to suppot new portmap for s5232f t0 config (#4670)
srideepDell May 31, 2020
6ca112e
Update sonic-restapi (#4692)
sumukhatv Jun 2, 2020
f9bb26f
[build] 'make reset' target will continue recursive operations if any…
jleveque Jun 1, 2020
3530695
[Submodule update] sonic-swss
abdosi Jun 3, 2020
8a66d9a
[Submodule update] sonic-swss-common
abdosi Jun 3, 2020
007eeec
[Submodule update] sonic-util
abdosi Jun 3, 2020
fe8d461
[submodule] Update sonic-linux-kernel pointer to pick up new kernel p…
keboliu Jun 4, 2020
e73a5f1
[Mellanox] Update SAI, SDK 4.4.0928 and FW xx.2007.1208 (#4704)
Jun 4, 2020
ccf12d2
SAI 3.7.5.1 (#4710)
judyjoseph Jun 8, 2020
b5a419e
[submodule update] sonic-swss
abdosi Jun 8, 2020
0a70571
[201911][thermal control] Backport feature from master branch (#4677)
Junchao-Mellanox Jun 8, 2020
093d773
[201911] DellEMC: Skip thermalctld and thermal platform API changes (…
ArunSaravananBalachandran Jun 11, 2020
50f4e7d
[Mellanox] Add ONIE and SSD platform components. (#4764)
nazariig Jun 15, 2020
62690f5
[Mellanox] Initialize system LED color to green for 201911 (#4743)
Junchao-Mellanox Jun 16, 2020
18bbbb3
[baseimage]: Run fsck filesystem check support prior mounting filesys…
olivier-singla Apr 30, 2020
42bc14f
[systemd] Relocate all SONiC unit files to /usr/lib/systemd/system (#…
jleveque May 30, 2020
ed0e6ae
[hostcfgd] Get service enable/disable feature working (#4676)
jleveque Jun 2, 2020
d10b597
[Mellanox] Upgrade mft to 4.14.1-8 (#4701)
Junchao-Mellanox Jun 11, 2020
aecebac
[ntp] disable ntp long jump (#4748)
yxieca Jun 11, 2020
030570d
[DellEMC]: EEPROM decoder for S6000, S6000-ON (#4718)
ArunSaravananBalachandran Jun 9, 2020
b4f45e9
Submodule update - sonic-restapi (#4749)
prsunny Jun 15, 2020
eb2fe4b
Fix MSN4700 sensors (#4753)
shlomibitton Jun 16, 2020
c625e0e
[build] Enable telemetry service by default (#4760)
jleveque Jun 12, 2020
c5807c2
[bgp]:Add redistribution connected for ipv6 also for Frontend ASICs (…
arlakshm Jun 16, 2020
f8a9a1b
[k8s]: switching to Flannel from Calico. (#4768)
renukamanavalan Jun 13, 2020
143e4f5
[MultiDB] Add REDIS_TIMEOUT_MSECS back which is removed by mistake (#…
dzhangalibaba Jun 11, 2020
4846fc0
[docker-syncd] Add timeout to force stop syncd container (#4617)
yozhao101 Jun 4, 2020
c656b4c
[Submodule update] sonic-util
abdosi Jun 16, 2020
96a8e24
[Submodule update] sonic-swss
abdosi Jun 16, 2020
85eb651
[submodule update] sonic-platfrom-daemons
abdosi Jun 16, 2020
a30a2ce
[submodule update] sonic-swss-common
abdosi Jun 16, 2020
bce65bb
[submodule update] sonic-platform-common
abdosi Jun 16, 2020
2f82cce
[Mellanox] Update SDK 4.4.0940 and FW xx.2007.1244 (#4777)
Jun 16, 2020
c2981b8
[build] Ensure /usr/lib/systemd/system/ directory exists before refer…
abdosi Jun 17, 2020
1d384be
[submodule update] sonic-sairedis
abdosi Jun 17, 2020
7b18d9c
[Mellanox] Update MFT to v4.14.5-2. (#4784)
nazariig Jun 17, 2020
a6877ad
Using (pci) device id to identify the ASIC on sai_switch_create (#4705)
judyjoseph Jun 18, 2020
9244925
[baseimage]: incrase docker ramfs from 900MB to 1300MB (#4800)
abdosi Jun 18, 2020
173168c
kubeadm package apt-get install has unmet dependency error (#4804)
abdosi Jun 19, 2020
c480de4
[Submodule update] sonic-dbsyncd (#4801)
abdosi Jun 19, 2020
817ce94
Fix bug: check port alias even when port_config_file parameter is not…
qiluo-msft Jun 17, 2020
9ffd870
Update .gitignore for platform (#4803)
pavel-shirshov Jun 18, 2020
d8886ba
[caclmgrd] Don't limit connection tracking to TCP (#4796)
jleveque Jun 18, 2020
7564b06
[DELL]: FTOS to SONiC fast conversion fixes (#4807)
padmanarayana Jun 19, 2020
16d39c6
[submodule update] sonic-utilities
abdosi Jun 22, 2020
415000b
added files to create SKU Mellanox-SN3800-D28C50 (#4809)
madhanmellanox Jun 21, 2020
b94c12d
modified files relevant to SKU Mellanox-SN3800-D112C8 (#4810)
madhanmellanox Jun 21, 2020
67e183d
added files to create SKU Mellanox-SN3800-C64 (#4812)
madhanmellanox Jun 22, 2020
337502c
converting to Platform based utils (#4830)
madhanmellanox Jun 23, 2020
c2364cf
[201911][dockers] Update critical_processes file syntax (#4854)
yozhao101 Jun 26, 2020
a84b534
[broadcom-sai]: Updated broadcom SAI to fix High CPU on TH/Th2 platfo…
abdosi Jun 27, 2020
7d436b3
[BFN] Disabled thermalctld for Barefoot platforms (#4823)
akokhan Jun 27, 2020
9db492e
[Mellanox] Update SDK to 4.4.0952, FW to *.2007.1280 (#4842)
keboliu Jun 26, 2020
33e2264
added files to create SKU Mellanox-SN3800-D24C52 (#4808)
madhanmellanox Jun 21, 2020
acafde1
[Mellanox] Change port index in port_config.ini to 1-based (#4781)
Junchao-Mellanox Jun 24, 2020
1bade2c
Add with_i2cdev for mst start to have I2C device loaded properly (#4790)
keboliu Jun 21, 2020
3d0126b
[platform-celestica]: Update fancontrol service for Seastone-DX010 de…
Dec 16, 2019
10cd212
[fast-reboot] Back up FDB/ARP/Default routes (#4795)
tahmed-dev Jun 20, 2020
0768bf7
[hostcfgd] Synchronize all feature statuses once upon start (#4714)
jleveque Jun 20, 2020
5df5015
[build][systemd] Mask disabled services by default (#4721)
jleveque Jun 24, 2020
2f97faa
[DellEMC] S52xx fix SFP reset in 1.0 API (#4858)
aravindmani-1 Jun 27, 2020
bbcd4c6
[Monit] Use the string "/usr/bin/syncd\s" to monitor the syncd proces…
yozhao101 Jun 26, 2020
d32beff
[201911][docker-lldp] Correct lldp-syncd program name in critical_pro…
yozhao101 Jun 28, 2020
c357a56
[201911] Add executable permission back to supervisor-proc-exit-liste…
Jul 3, 2020
ee13e78
Disable thermalctld for arista platforms (#4892)
zzhiyuan Jul 5, 2020
b6b1f3f
syslog changes Multi ASIC platforms (#4738)
arlakshm Jun 30, 2020
75d5e30
Changes to make default route programming correct in multi-npu platfo…
abdosi Jun 29, 2020
fad2d47
[systemd-generator]: Fix dependency update for multi-asic platform (#…
SuvarnaMeenakshi Jun 29, 2020
a80683d
Support for connecting to DB in namespace via TCP port in multi-asic …
judyjoseph Jun 30, 2020
4869fa7
[sonic-buildimage] Changes to make network specific sysctl common for…
abdosi Jul 1, 2020
9c62ce9
Tests of FRR templates which rendered by sonic-cfggen (#4875)
pavel-shirshov Jul 2, 2020
369bf88
[Dell]: DellEMC S6100 disable pericom/xlinx chipset (#4868)
Jul 3, 2020
7d840ba
[pfx_filter]: Add a prefix mask by default in pfx_filter, when there …
pavel-shirshov Jul 2, 2020
96ef32a
[mellanox]: Fix for MSN4600C sensors (#4754)
shlomibitton Jun 12, 2020
1930b3a
[bgpcfgd]: make a package for bgpcfgd (#4813)
pavel-shirshov Jun 21, 2020
6958441
Tests for bgpcfgd templates (#4841)
pavel-shirshov Jun 25, 2020
35e9d5b
[docker-sonic-mgmt]: Add docker-ce-cli to sonic-mgmt container (#3868)
msosyak Dec 11, 2019
3eac616
[sonic-mgmt]: Install python-subnettree to sonic-mgmt container. (#3978)
iris00522 Jan 8, 2020
c9e012d
[docker-sonic-mgmt]: fix installation permission issue
lguohan Jan 12, 2020
5310b09
[docker-sonic-mgmt]: set wheel version to 0.33.6 to fix sonic-mgmt bu…
lguohan Jan 31, 2020
db15b88
[docker-sonic-mgmt]: Add the snmp tool to the sonic-mgmt docker (#4110)
wangxin Feb 5, 2020
d289459
[sonic-mgmt]: Support virtual environment for ansible 2.0.0.2 (#4325)
xumia Mar 31, 2020
276310d
[docker-sonic-mgmt]: Fix virtual environment bug (#4370)
xumia Apr 5, 2020
1652206
[docker-sonic-mgmt] Merge spytest dependencies into mgmt docker (#4411)
daall Apr 12, 2020
9b32171
[docker-sonic-mgmt] Add IxNetwork python client (#4533)
baiwei0427 May 6, 2020
86955e2
[docker-sonic-mgmt]: fix pip version to 20.1.1
lguohan May 26, 2020
3129451
[sonic-mgmt] upgrade paramilo to version 2.7.1 (#4750)
yxieca Jun 11, 2020
8a26951
[sonic-mgmt] upgrade ansible to 2.7.12 (#4751)
yxieca Jun 12, 2020
abe2d40
[docker-sonic-mgmt]: import patch to support 'become' and 'become_use…
ArunSaravananBalachandran Jun 12, 2020
fbdd775
[mgmt docker] Clean up docker-sonic-mgmt dockerfile (#4759)
daall Jun 16, 2020
b7b602b
[sonic-mgmt]: Support for pytest-html to control logs better (#4791)
shubav Jun 26, 2020
a47add5
[sonic-ztp]: Update submodule pointer (#4902)
rajendra-dendukuri Jul 7, 2020
3f4fdbe
Merge pull request #198 from Azure/201911
Alex-Dai Jul 7, 2020
484ac25
Merge pull request #5 from SONIC-DEV/201911
Alex-Dai Jul 7, 2020
40aa0fc
Merge pull request #6 from Alex-Dai/201911
Alex-Dai Jul 7, 2020
94a725b
update protobuf compiler and units install
Jul 13, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,16 @@ src/**/debian/stamp-autotools-files

# .o files
src/**/*.o

# platform
platform/**/*.egg-info
platform/**/*-none-any.whl
platform/**/.pybuild
platform/**/debian/*
platform/**/build
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
platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py
6 changes: 3 additions & 3 deletions Makefile.work
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ SONIC_BUILD_INSTRUCTION := make \
INSTALL_KUBERNETES=$(INSTALL_KUBERNETES) \
KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
K8s_CNI_CALICO_VERSION=$(K8s_CNI_CALICO_VERSION) \
K8s_CNI_FLANNEL_VERSION=$(K8s_CNI_FLANNEL_VERSION) \
SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
SONIC_INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \
Expand Down Expand Up @@ -252,8 +252,8 @@ reset :
fi
git clean -xfdf;
git reset --hard;
git submodule foreach --recursive git clean -xfdf;
git submodule foreach --recursive git reset --hard;
git submodule foreach --recursive 'git clean -xfdf || true';
git submodule foreach --recursive 'git reset --hard || true';
git submodule update --init --recursive;
echo "Reset complete!";
else
Expand Down
68 changes: 24 additions & 44 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-
sudo cp files/initramfs-tools/resize-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs

# Hook into initramfs: run fsck to repair a non-clean filesystem prior to be mounted
sudo cp files/initramfs-tools/fsck-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs

## Hook into initramfs: after partition mount and loop file mount
## 1. Prepare layered file system
## 2. Bind-mount docker working directory (docker overlay storage cannot work over overlay rootfs)
Expand Down Expand Up @@ -213,6 +217,14 @@ then
## Check out the sources list update matches current Debian version
sudo cp files/image_config/kubernetes/kubernetes.list $FILESYSTEM_ROOT/etc/apt/sources.list.d/
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
if [[ $KUBERNETES_VERSION == 1.18.0 ]]; then
# kubeadm 1.18.0 package auto install has some dependency error so install
# those package explicitly.
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubernetes-cni=0.7.5-00
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubelet=1.18.3-00
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubectl=1.18.3-00
fi
# else kubeadm package auto install kubelet & kubectl
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${KUBERNETES_VERSION}-00
# kubeadm package auto install kubelet & kubectl
else
Expand Down Expand Up @@ -362,59 +374,27 @@ EOF
sudo sed -i 's/^ListenAddress ::/#ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
sudo sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' $FILESYSTEM_ROOT/etc/ssh/sshd_config

## Config sysctl
sudo mkdir -p $FILESYSTEM_ROOT/var/core

# Config sysctl
sudo augtool --autosave "
set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %t %p'

set /files/etc/sysctl.conf/kernel.softlockup_panic 1
set /files/etc/sysctl.conf/kernel.panic 10
set /files/etc/sysctl.conf/vm.panic_on_oom 2
set /files/etc/sysctl.conf/fs.suid_dumpable 2

set /files/etc/sysctl.conf/net.ipv4.conf.default.forwarding 1
set /files/etc/sysctl.conf/net.ipv4.conf.all.forwarding 1
set /files/etc/sysctl.conf/net.ipv4.conf.eth0.forwarding 0

set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_accept 0
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_announce 0
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_filter 0
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_notify 0
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_ignore 0
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_accept 0
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_announce 1
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_filter 0
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_notify 1
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_ignore 2

set /files/etc/sysctl.conf/net.ipv4.neigh.default.base_reachable_time_ms 1800000
set /files/etc/sysctl.conf/net.ipv6.neigh.default.base_reachable_time_ms 1800000
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh1 1024
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh1 1024
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh2 2048
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh2 2048
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh3 4096
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh3 4096

set /files/etc/sysctl.conf/net.ipv6.conf.default.forwarding 1
set /files/etc/sysctl.conf/net.ipv6.conf.all.forwarding 1
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.forwarding 0

set /files/etc/sysctl.conf/net.ipv6.conf.default.accept_dad 0
set /files/etc/sysctl.conf/net.ipv6.conf.all.accept_dad 0
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_dad 0

set /files/etc/sysctl.conf/net.ipv6.conf.default.keep_addr_on_down 1
set /files/etc/sysctl.conf/net.ipv6.conf.all.keep_addr_on_down 1
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.keep_addr_on_down 1

set /files/etc/sysctl.conf/net.ipv4.tcp_l3mdev_accept 1
set /files/etc/sysctl.conf/net.ipv4.udp_l3mdev_accept 1

set /files/etc/sysctl.conf/net.core.rmem_max 2097152
set /files/etc/sysctl.conf/net.core.wmem_max 2097152
" -r $FILESYSTEM_ROOT

sysctl_net_cmd_string=""
while read line; do
[[ "$line" =~ ^#.*$ ]] && continue
sysctl_net_conf_key=`echo $line | awk -F '=' '{print $1}'`
sysctl_net_conf_value=`echo $line | awk -F '=' '{print $2}'`
sysctl_net_cmd_string=$sysctl_net_cmd_string"set /files/etc/sysctl.conf/$sysctl_net_conf_key $sysctl_net_conf_value"$'\n'
done < files/image_config/sysctl/sysctl-net.conf

sudo augtool --autosave "$sysctl_net_cmd_string" -r $FILESYSTEM_ROOT

if [[ $CONFIGURED_ARCH == amd64 ]]; then
# Configure mcelog to log machine checks to syslog
sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"skip_thermalctld": true,
"skip_fancontrol": true,
"skip_ledd": true,
"skip_xcvrd": false,
"skip_psud": false,
"skip_syseepromd": false
"skip_syseepromd": false
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_thermalctld": true,
"skip_fancontrol": true,
"skip_ledd": true,
"skip_xcvrd": false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_thermalctld": true,
"skip_fancontrol": true,
"skip_ledd": true,
"skip_xcvrd": false,
Expand Down
12 changes: 0 additions & 12 deletions device/celestica/x86_64-cel_seastone-r0/fancontrol

This file was deleted.

11 changes: 11 additions & 0 deletions device/celestica/x86_64-cel_seastone-r0/fancontrol-B2F
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Configuration file generated by pwmconfig, changes will be lost
INTERVAL=2
FCTEMPS=13-002e/pwm1=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-002e/pwm2=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-002e/pwm3=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-002e/pwm4=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-002e/pwm5=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm1=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm2=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm3=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm4=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm5=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input
FCFANS=13-004d/pwm5=13-004d/fan5_input 13-004d/pwm4=13-004d/fan4_input 13-004d/pwm3=13-004d/fan3_input 13-004d/pwm2=13-004d/fan2_input 13-004d/pwm1=13-004d/fan1_input 13-002e/pwm5=13-002e/fan5_input 13-002e/pwm4=13-002e/fan4_input 13-002e/pwm3=13-002e/fan3_input 13-002e/pwm2=13-002e/fan2_input 13-002e/pwm1=13-002e/fan1_input
MINTEMP=13-002e/pwm1=27 13-002e/pwm2=27 13-002e/pwm3=27 13-002e/pwm4=27 13-002e/pwm5=27 13-004d/pwm1=27 13-004d/pwm2=27 13-004d/pwm3=27 13-004d/pwm4=27 13-004d/pwm5=27
MAXTEMP=13-002e/pwm1=46 13-002e/pwm2=46 13-002e/pwm3=46 13-002e/pwm4=46 13-002e/pwm5=46 13-004d/pwm1=46 13-004d/pwm2=46 13-004d/pwm3=46 13-004d/pwm4=46 13-004d/pwm5=46
MINSTART=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
MINSTOP=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
MINPWM=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
MAXPWM=13-002e/pwm1=255 13-002e/pwm2=255 13-002e/pwm3=255 13-002e/pwm4=255 13-002e/pwm5=255 13-004d/pwm1=255 13-004d/pwm2=255 13-004d/pwm3=255 13-004d/pwm4=255 13-004d/pwm5=255
THYST=13-002e/pwm1=3 13-002e/pwm2=3 13-002e/pwm3=3 13-002e/pwm4=3 13-002e/pwm5=3 13-004d/pwm1=3 13-004d/pwm2=3 13-004d/pwm3=3 13-004d/pwm4=3 13-004d/pwm5=3
12 changes: 12 additions & 0 deletions device/celestica/x86_64-cel_seastone-r0/fancontrol-F2B
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Configuration file generated by pwmconfig, changes will be lost
INTERVAL=2
FCTEMPS=13-002e/pwm1=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-002e/pwm2=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-002e/pwm3=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-002e/pwm4=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-002e/pwm5=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm1=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm2=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm3=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm4=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm5=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input
FCFANS=13-004d/pwm5=13-004d/fan5_input 13-004d/pwm4=13-004d/fan4_input 13-004d/pwm3=13-004d/fan3_input 13-004d/pwm2=13-004d/fan2_input 13-004d/pwm1=13-004d/fan1_input 13-002e/pwm5=13-002e/fan5_input 13-002e/pwm4=13-002e/fan4_input 13-002e/pwm3=13-002e/fan3_input 13-002e/pwm2=13-002e/fan2_input 13-002e/pwm1=13-002e/fan1_input
MINTEMP=13-002e/pwm1=26 13-002e/pwm2=26 13-002e/pwm3=26 13-002e/pwm4=26 13-002e/pwm5=26 13-004d/pwm1=26 13-004d/pwm2=26 13-004d/pwm3=26 13-004d/pwm4=26 13-004d/pwm5=26
MAXTEMP=13-002e/pwm1=45 13-002e/pwm2=45 13-002e/pwm3=45 13-002e/pwm4=45 13-002e/pwm5=45 13-004d/pwm1=45 13-004d/pwm2=45 13-004d/pwm3=45 13-004d/pwm4=45 13-004d/pwm5=45
MINSTART=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
MINSTOP=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
MINPWM=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
MAXPWM=13-002e/pwm1=255 13-002e/pwm2=255 13-002e/pwm3=255 13-002e/pwm4=255 13-002e/pwm5=255 13-004d/pwm1=255 13-004d/pwm2=255 13-004d/pwm3=255 13-004d/pwm4=255 13-004d/pwm5=255
THYST=13-002e/pwm1=3 13-002e/pwm2=3 13-002e/pwm3=3 13-002e/pwm4=3 13-002e/pwm5=3 13-004d/pwm1=3 13-004d/pwm2=3 13-004d/pwm3=3 13-004d/pwm4=3 13-004d/pwm5=3

22 changes: 15 additions & 7 deletions device/dell/x86_64-dell_s6000_s1220-r0/plugins/eeprom.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,21 @@
#############################################################################

try:
from sonic_eeprom import eeprom_tlvinfo
except ImportError, e:
raise ImportError (str(e) + "- required module not found")
from sonic_eeprom.eeprom_tlvinfo import TlvInfoDecoder
from sonic_platform.eeprom import EepromS6000
except ImportError as e:
raise ImportError(str(e) + "- required module not found")


class board(eeprom_tlvinfo.TlvInfoDecoder):
class board(object):

def __init__(self, name, path, cpld_root, ro):
self.eeprom_path = "/sys/class/i2c-adapter/i2c-10/10-0053/eeprom"
super(board, self).__init__(self.eeprom_path, 0, '', True)
def __new__(cls, name, path, cpld_root, ro):
eeprom_path = "/sys/class/i2c-adapter/i2c-10/10-0053/eeprom"

with open("/sys/class/dmi/id/product_name", "r") as fd:
board_type = fd.read()

if 'S6000-ON' in board_type:
return TlvInfoDecoder(eeprom_path, 0, '', True)
else:
return EepromS6000(is_plugin=True)
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ Ethernet80 81,82 fiftyGigE1/21/1 21 50000
Ethernet82 83,84 fiftyGigE1/21/2 21 50000
Ethernet84 85,86 fiftyGigE1/22/1 22 50000
Ethernet86 87,88 fiftyGigE1/22/2 22 50000
Ethernet88 89,90 fiftyGigE1/23/1 23 50000
Ethernet90 91,92 fiftyGigE1/23/2 23 50000
Ethernet92 93,94 fiftyGigE1/24/1 24 50000
Ethernet94 95,96 fiftyGigE1/24/2 24 50000
Ethernet96 97,98 fiftyGigE1/25/1 25 50000
Ethernet98 99,100 fiftyGigE1/25/2 25 50000
Ethernet100 101,102 fiftyGigE1/26/1 26 50000
Ethernet102 103,104 fiftyGigE1/26/2 26 50000
Ethernet104 105,106,107,108 hundredGigE1/27 27 100000
Ethernet108 109,110,111,112 hundredGigE1/28 28 100000
Ethernet112 113,114,115,116 hundredGigE1/29 29 100000
Ethernet116 117,118,119,120 hundredGigE1/30 30 100000
Ethernet88 89,90,91,92 hundredGigE1/23 23 100000
Ethernet92 93,94,95,96 hundredGigE1/24 24 100000
Ethernet96 97,98,99,100 hundredGigE1/25 25 100000
Ethernet100 101,102,103,104 hundredGigE1/26 26 100000
Ethernet104 105,106 fiftyGigE1/27/1 27 50000
Ethernet106 107,108 fiftyGigE1/27/2 27 50000
Ethernet108 109,110 fiftyGigE1/28/1 28 50000
Ethernet110 111,112 fiftyGigE1/28/2 28 50000
Ethernet112 113,114 fiftyGigE1/29/1 29 50000
Ethernet114 115,116 fiftyGigE1/29/2 29 50000
Ethernet116 117,118 fiftyGigE1/30/1 30 50000
Ethernet118 119,120 fiftyGigE1/30/2 30 50000
Ethernet120 121,122 fiftyGigE1/31/1 31 50000
Ethernet122 123,124 fiftyGigE1/31/2 31 50000
Ethernet124 125,126 fiftyGigE1/32/1 32 50000
Expand Down
Loading