Merge linkedin/dev 3.0 on top of Azure 2020212

Commit: 50e4cc1 Backport ethtool to support QSFP-DD (sonic-net#5725) Using Diff from Last Merge i.e. below commit: 6aef4d3 (HEAD) Merge branch 'dev_3.0' of ssh://git.corp.linkedin.com:29418/sonic/sonic-buildimage into MERGE_201911_0824 diff from 4810db8 [monit]: monit_telemetry which will have error when telemetry is in secure mode (sonic-net#4286) Signed-off-by: svc-lnos-user <svc-lnos-user@linkedin.com> Signed-off-by: Praveen Chaudhary <pchaudhary@linkedin.com> RB= G=lnos-reviewers R=pchaudhary,pmao,samaity,zxu A= RB= G=lnos-reviewers R=pchaudhary,pmao,samaity,zxu A= Changes to be committed: new file: .reviewboardrc new file: acl/main.acl modified: build_debian.sh modified: device/celestica/x86_64-cel_e1031-r0/installer.conf new file: device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-50-40/th-seastone-dx010-32x50G-16x100G.config.bcm new file: device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-50-50-40/th-seastone-dx010-48x50G-8x100G.config.bcm modified: device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/buffers.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/buffers_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/buffers_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/inno.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/innovium.77700_B new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/pg_profile_lookup.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/pltfm.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/port_config.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/qos.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/qos_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/qos_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/sai.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32C/utopias_32x100.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/buffers.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/buffers_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/buffers_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/config_db.json new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/inno.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/innovium.77700_A new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/pg_profile_lookup.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/pltfm.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/port_config.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/qos.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/qos_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/qos_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/sai.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-32d/utopias_p3b.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/buffers.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/buffers_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/buffers_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/config_db.json new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/inno.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/innovium.77700_B new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/pg_profile_lookup.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/pltfm.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/port_config.ini new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/qos.json.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/qos_defaults_def_lossy.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/qos_defaults_t1.j2 new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/sai.profile new file: device/cisco/x86_64-cisco_N3K_C3432D/Nexus-C3432D-brk/utopias_128x100.config.yaml new file: device/cisco/x86_64-cisco_N3K_C3432D/default_sku new file: device/cisco/x86_64-cisco_N3K_C3432D/installer.conf new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/eeprom.py new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/led_control.py new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/psuutil.py new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/qsfpdd.py new file: device/cisco/x86_64-cisco_N3K_C3432D/plugins/sfputil.py new file: device/cisco/x86_64-cisco_N3K_C3432D/sensors.conf new file: device/cisco/x86_64-cisco_N3K_C3432D/topo.conf new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-100/port_config.ini new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-100/sai.profile new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-100/th-cisco-3232c-32x100G.config.bcm new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-25-50/port_config.ini new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-25-50/sai.profile new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-25-50/th-cisco-3232c-96x25G-16x50G.config.bcm new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-50/port_config.ini new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-50/sai.profile new file: device/cisco/x86_64-n3200-r0/Cisco-3232C-50/th-cisco-3232c-64x50G.config.bcm new file: device/cisco/x86_64-n3200-r0/installer.conf new file: device/cisco/x86_64-n3200-r0/plugins/eeprom.py new file: device/cisco/x86_64-n3200-r0/plugins/led_control.py new file: device/cisco/x86_64-n3200-r0/plugins/psuutil.py new file: device/cisco/x86_64-n3200-r0/plugins/sfputil.py new file: device/cisco/x86_64-n3200-r0/sensors.conf new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-100/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-100/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-100/th-open19-bolt-32x100G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-100/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-100/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-100/th-open19-bolt-96x25G-8x100G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-50/hwsku.json new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-50/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-50/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-25-50/th-open19-bolt-96x25G-16x50G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-100/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-100/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-100/th-open19-bolt-48x50G-8x100G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-50/port_config.ini new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-50/sai.profile new file: device/linkedin/x86_64-flex_bolthawk-r0/Open19-Bolt-50-50/th-open19-bolt-48x50G-16x50G.config.bcm new file: device/linkedin/x86_64-flex_bolthawk-r0/i2c_init.sh new file: device/linkedin/x86_64-flex_bolthawk-r0/installer.conf new file: device/linkedin/x86_64-flex_bolthawk-r0/led-code/ledcode0 new file: device/linkedin/x86_64-flex_bolthawk-r0/led_proc_init.soc new file: device/linkedin/x86_64-flex_bolthawk-r0/platform.json new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/eeprom.py new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/helper_data.json new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/sensorutil.py new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/sfputil.py new file: device/linkedin/x86_64-flex_bolthawk-r0/plugins/urlheader.py new file: device/linkedin/x86_64-flex_bolthawk-r0/th-open19-bolt-flex-all.config.bcm new file: device/linkedin/x86_64-open19_bolt-r0 new file: device/linkedin/x86_64-qwave_bolt_uefi-r0 modified: dockers/docker-base/Dockerfile.j2 modified: dockers/docker-fpm-quagga/supervisord.conf modified: dockers/docker-router-advertiser/docker-init.sh modified: dockers/docker-router-advertiser/radvd.conf.j2 modified: dockers/docker-sonic-telemetry/Dockerfile.j2 new file: dockers/docker-sonic-telemetry/node_exporter.sh modified: dockers/docker-sonic-telemetry/start.sh modified: dockers/docker-sonic-telemetry/supervisord.conf modified: files/build_templates/docker_image_ctl.j2 modified: files/build_templates/organization_extensions.sh modified: files/build_templates/sonic_debian_extension.j2 modified: files/image_config/bash/bash.bashrc modified: files/image_config/interfaces/interfaces.j2 modified: files/image_config/rsyslog/rsyslog.conf.j2 modified: files/scripts/arp_update modified: installer/x86_64/install.sh modified: platform/broadcom/docker-syncd-brcm/Dockerfile.j2 modified: platform/broadcom/docker-syncd-brcm/start.sh modified: platform/broadcom/docker-syncd-brcm/supervisord.conf modified: platform/broadcom/one-image.mk new file: platform/broadcom/platform-modules-linkedin.mk new file: platform/broadcom/platform-modules-n9200.mk modified: platform/broadcom/rules.mk new file: platform/broadcom/sonic-platform-modules-linkedin/LICENSE new file: platform/broadcom/sonic-platform-modules-linkedin/README.md new file: platform/broadcom/sonic-platform-modules-linkedin/bolt-cel new file: platform/broadcom/sonic-platform-modules-linkedin/bolt-flex-old new file: platform/innovium/docker-orchagent-invm.mk new file: platform/innovium/platform-modules-cisco.mk modified: platform/vs/docker-sonic-vs/Dockerfile.j2 new file: release_version.json modified: rules/config modified: rules/docker-telemetry.mk modified: rules/sonic-utilities.mk modified: rules/telemetry.mk modified: slave.mk modified: sonic-slave-stretch/Dockerfile.j2 modified: src/sonic-config-engine/minigraph.py modified: src/sonic-device-data/tests/permitted_list new file: src/sonic-device-data/tests/platformJson_checker new file: src/wpasupplicant/sonic-wpa-supplicant Conflicts: .reviewboardrc acl/ build_debian.sh.rej device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-50-40/th-seastone-dx010-32x50G-16x100G.config.bcm device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-50-50-40/th-seastone-dx010-48x50G-8x100G.config.bcm device/cisco/ device/linkedin/ dockers/docker-router-advertiser/docker-init.sh.rej dockers/docker-sonic-telemetry/node_exporter.sh files/build_templates/docker_image_ctl.j2.rej files/build_templates/sonic_debian_extension.j2.rej files/image_config/interfaces/interfaces.j2.rej files/image_config/logrotate/logrotate.d/rsyslog.rej files/image_config/rsyslog/rsyslog.d/00-sonic.conf.rej files/scripts/arp_update.rej platform/broadcom/docker-syncd-brcm/Dockerfile.j2.rej platform/broadcom/platform-modules-linkedin.mk platform/broadcom/platform-modules-n9200.mk platform/broadcom/sai.mk.rej platform/broadcom/sonic-platform-modules-linkedin/ platform/innovium/docker-orchagent-invm.mk platform/innovium/platform-modules-cisco.mk platform/vs/docker-sonic-vs.mk.rej platform/vs/docker-sonic-vs/Dockerfile.j2.rej platform/vs/docker-sonic-vs/start.sh.rej release_version.json rules/config.rej rules/docker-telemetry.mk.rej rules/sonic-platform-common.mk.rej rules/sonic-utilities.mk.rej rules/sonic-yang-mgmt-py2.mk rules/telemetry.mk.rej slave.mk.rej sonic-slave-jessie/Dockerfile.j2.rej sonic-slave-stretch/Dockerfile.j2.rej src/sonic-config-engine/minigraph.py.rej src/sonic-config-engine/portconfig.py.rej src/sonic-config-engine/sonic-cfggen.rej src/sonic-device-data/src/Makefile.rej src/sonic-device-data/tests/media_checker.rej src/sonic-device-data/tests/permitted_list.rej src/sonic-device-data/tests/platformJson_checker src/wpasupplicant/
praveen-li · May 14, 2021 · 4595c37 · 4595c37
1 parent 50e4cc1
commit 4595c37
Show file tree

Hide file tree

Showing 142 changed files with 19,854 additions and 64 deletions.
diff --git a/.reviewboardrc b/.reviewboardrc
@@ -0,0 +1,3 @@
+REPOSITORY = "sonic-buildimage"
+REVIEWBOARD_URL = "https://rb.corp.linkedin.com"
+TARGET_GROUPS = "lnos-reviewers"
diff --git a/acl/main.acl b/acl/main.acl
@@ -0,0 +1,3 @@
+owners: [ pchaudha, pmao, arajure, samaity, zxu ]
+paths: [ '.*' ]
+exclude_paths: [ 'src/.*', 'files/.*', 'platform/.*', 'release_version.json', 'rules/sonic-utilities.mk' ]
diff --git a/build_debian.sh b/build_debian.sh
@@ -296,6 +296,14 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     sysfsutils              \
     squashfs-tools          \
     grub2-common            \
+    gdb                     \
+    patch                   \
+    wget                    \
+    strace                  \
+    htop                    \
+    valgrind                \
+    smartmontools           \
+    sshpass                 \
     rsyslog                 \
     screen                  \
     hping3                  \
@@ -402,6 +410,54 @@ set /files/etc/sysctl.conf/kernel.panic 10
 set /files/etc/sysctl.conf/kernel.hung_task_timeout_secs 300
 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 60000
+set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_stale_time 1800
+
+set /files/etc/sysctl.conf/net.ipv6.neigh.default.base_reachable_time_ms 60000
+set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_stale_time 1800
+
+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
+
+set /files/etc/sysctl.conf/net.netfilter.nf_conntrack_checksum 0
 " -r $FILESYSTEM_ROOT
 
 sysctl_net_cmd_string=""
@@ -431,6 +487,10 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docke
 # Install scapy
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'
 
+# Get package to support Dynamic Port Breakout
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install xmltodict==0.12.0
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install jsondiff==1.2.0
+
 ## Note: keep pip installed for maintainance purpose
 
 # Install GCC, needed for building/installing some Python packages
@@ -494,8 +554,10 @@ fi
 ## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
 if [ "${enable_organization_extensions}" = "y" ]; then
    if [ -f files/build_templates/organization_extensions.sh ]; then
-      sudo chmod 755 files/build_templates/organization_extensions.sh
-      ./files/build_templates/organization_extensions.sh -f $FILESYSTEM_ROOT -h $HOSTNAME
+      sudo chmod 755 files/build_templates/organization_extensions.sh 
+      ./files/build_templates/organization_extensions.sh -f $FILESYSTEM_ROOT \
+                                                         -h $HOSTNAME \
+                                                         -p $PASSWORD_ENCRYPTED
    fi
 fi
 

diff --git a/device/celestica/x86_64-cel_e1031-r0/installer.conf b/device/celestica/x86_64-cel_e1031-r0/installer.conf
@@ -1,4 +1,4 @@
 CONSOLE_PORT=0x2f8
 CONSOLE_DEV=1
-CONSOLE_SPEED=9600
+CONSOLE_SPEED=115200
 ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich"