Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…

…to fix_rates

Conflicts:
	dockers/docker-orchagent/enable_counters.py

Makefile.cache

@@ -325,9 +325,9 @@ define SHOW_WHY
 	@echo "[ FLAGS  FILE    ] : [$($(1)_FILE_FLAGS)] " >> $($(1)_DST_PATH)/$(1).log
 	@echo "[ FLAGS  DEPENDS ] : [$($(1)_DEP_FLAGS_ALL)] " >> $($(1)_DST_PATH)/$(1).log
 	@echo "[ FLAGS  DIFF    ] : [$($(1)_FLAGS_DIFF)] " >> $($(1)_DST_PATH)/$(1).log
-	@echo "[ DEP    DEPENDS ] : [$($(1)_DEP_FILES_MODIFIED)] " >> $($(1)_DST_PATH)/$(1).log
-	@echo "[ SMDEP  DEPENDS ] : [$($(1)_SMDEP_FILES_MODIFIED)] " >> $($(1)_DST_PATH)/$(1).log
-	@echo "[ TARGET DEPENDS ] : [$?] " >> $($(1)_DST_PATH)/$(1).log
+	@$(file >>$($(1)_DST_PATH)/$(1).log, "[ DEP    DEPENDS ] : [$($(1)_DEP_FILES_MODIFIED)] ")
+	@$(file >>$($(1)_DST_PATH)/$(1).log, "[ SMDEP  DEPENDS ] : [$($(1)_SMDEP_FILES_MODIFIED)] ")
+	@$(file >>$($(1)_DST_PATH)/$(1).log, "[ TARGET DEPENDS ] : [$?] ")
 endef
 
 

Makefile.work

@@ -190,6 +190,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            PLATFORM_ARCH=$(PLATFORM_ARCH) \
                            BUILD_NUMBER=$(BUILD_NUMBER) \
                            BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \
+                           SONIC_IMAGE_VERSION=$(SONIC_IMAGE_VERSION) \
                            ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
                            ENABLE_ZTP=$(ENABLE_ZTP) \
                            SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
@@ -300,6 +301,7 @@ reset :
 	        git reset --hard;
 	        git submodule foreach --recursive 'git clean -xfdf || true';
 	        git submodule foreach --recursive 'git reset --hard || true';
+	        git submodule foreach --recursive 'git remote update || true';
 	        git submodule update --init --recursive;
 	        echo "Reset complete!";
 	    else

README.md

@@ -14,6 +14,10 @@
 [![P4](https://sonic-jenkins.westus2.cloudapp.azure.com/job/p4/job/buildimage-p4-all/badge/icon?subject=P4)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/p4/job/buildimage-p4-all)
 [![VS](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-all/badge/icon?subject=VS)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-all)
 
+*202006 builds*:
+
+[![Barefoot](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-202006/badge/icon?subject=Barefoot)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-202006/)
+
 *201911 builds*:
 
 [![Barefoot](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-201911/badge/icon?subject=Barefoot)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-201911/)

build_debian.sh

@@ -315,8 +315,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     python-pip              \
     python3-pip             \
     cron                    \
-    haveged
-
+    haveged                 \
+    jq
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
@@ -396,7 +396,7 @@ 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 %P'
+set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/local/bin/coredump-compress %e %t %p %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
@@ -413,13 +413,15 @@ done < files/image_config/sysctl/sysctl-net.conf
 
 sudo augtool --autosave "$sysctl_net_cmd_string" -r $FILESYSTEM_ROOT
 
-## docker Python API package is needed by Ansible docker module
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install 'docker==4.1.0'
+# docker Python API package is needed by Ansible docker module as well as some SONiC applications
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install 'docker==4.1.0'
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==4.3.1'
+
 ## Note: keep pip installed for maintainance purpose
 
 ## Get gcc and python dev pkgs
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install gcc libpython2.7-dev
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install 'netifaces==0.10.7'
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install 'netifaces==0.10.7'
 
 ## Create /var/run/redis folder for docker-database to mount
 sudo mkdir -p $FILESYSTEM_ROOT/var/run/redis
@@ -449,7 +451,7 @@ fi
 ## Version file
 sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
 sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml > /dev/null <<EOF
-build_version: '$(sonic_get_version)'
+build_version: '${SONIC_IMAGE_VERSION}'
 debian_version: '$(cat $FILESYSTEM_ROOT/etc/debian_version)'
 kernel_version: '$kversion'
 asic_type: $sonic_asic_platform
@@ -463,7 +465,8 @@ EOF
 sudo cp ./files/scripts/core_cleanup.py $FILESYSTEM_ROOT/usr/bin/core_cleanup.py
 
 ## Copy ASIC config checksum
-python files/build_scripts/generate_asic_config_checksum.py
+sudo chmod 755 files/build_scripts/generate_asic_config_checksum.py
+./files/build_scripts/generate_asic_config_checksum.py
 if [[ ! -f './asic_config_checksum' ]]; then
     echo 'asic_config_checksum not found'
     exit 1

build_image.sh

@@ -23,7 +23,7 @@ fi
     exit 1
 }
 
-IMAGE_VERSION=$(. functions.sh && sonic_get_version)
+IMAGE_VERSION="${SONIC_IMAGE_VERSION}"
 
 generate_onie_installer_image()
 {

device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as5712-72x10G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as5812_54t-r0/Accton-AS5812-54T/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as5812t-72x10G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as5812_54t-r0/plugins/sfputil.py

@@ -5,7 +5,6 @@
 try:
     import time
     import os
-    import pickle
     from ctypes import create_string_buffer
     from sonic_sfp.sfputilbase import SfpUtilBase
 except ImportError as e:
@@ -83,16 +82,13 @@ def __init__(self):
 
     #Two i2c buses might get flipped order, check them both.
     def update_i2c_order(self):
-        if os.path.exists("/tmp/accton_util.p"):
-            self.I2C_BUS_ORDER = pickle.load(open("/tmp/accton_util.p", "rb"))
-        else:
-            if self.I2C_BUS_ORDER < 0:
-                eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
-                if os.path.exists(eeprom_path):
-                    self.I2C_BUS_ORDER = 0
-                eeprom_path = "/sys/bus/i2c/devices/0-0057/eeprom"
-                if os.path.exists(eeprom_path):
-                    self.I2C_BUS_ORDER = 1
+        if self.I2C_BUS_ORDER < 0:
+            eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
+            if os.path.exists(eeprom_path):
+                self.I2C_BUS_ORDER = 0
+            eeprom_path = "/sys/bus/i2c/devices/0-0057/eeprom"
+            if os.path.exists(eeprom_path):
+                self.I2C_BUS_ORDER = 1
         return self.I2C_BUS_ORDER 
 
     def get_presence(self, port_num):
@@ -285,4 +281,3 @@ def get_transceiver_change_event(self, timeout=2000):
         else:
             return True, {}
         return False, {}
-

device/accton/x86_64-accton_as5812_54x-r0/Accton-AS5812-54X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as5812-72x10G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as5812_54x-r0/plugins/sfputil.py

@@ -5,7 +5,6 @@
 try:
     import time
     import os
-    import pickle
     from ctypes import create_string_buffer
     from sonic_sfp.sfputilbase import SfpUtilBase
 except ImportError as e:
@@ -132,16 +131,13 @@ def __init__(self):
 
     #Two i2c buses might get flipped order, check them both.
     def update_i2c_order(self):
-        if os.path.exists("/tmp/accton_util.p"):
-            self.I2C_BUS_ORDER = pickle.load(open("/tmp/accton_util.p", "rb"))
-        else:
-            if self.I2C_BUS_ORDER < 0:
-                eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
-                if os.path.exists(eeprom_path):
-                    self.I2C_BUS_ORDER = 0
-                eeprom_path = "/sys/bus/i2c/devices/0-0057/eeprom"
-                if os.path.exists(eeprom_path):
-                    self.I2C_BUS_ORDER = 1
+        if self.I2C_BUS_ORDER < 0:
+            eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
+            if os.path.exists(eeprom_path):
+                self.I2C_BUS_ORDER = 0
+            eeprom_path = "/sys/bus/i2c/devices/0-0057/eeprom"
+            if os.path.exists(eeprom_path):
+                self.I2C_BUS_ORDER = 1
         return self.I2C_BUS_ORDER 
 
     def get_presence(self, port_num):

device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/sai.profile

@@ -1,2 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/mv2-as5835t-48x10G+6x100G.config.bcm
 SAI_BOARD_CONFIG_PATH=/etc/accton
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/etc/bcm/mv2-as5835-48x10G+6x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as6712_32x-r0/Accton-AS6712-32X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as6712-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/chassis.py

@@ -93,7 +93,7 @@ def get_base_mac(self):
         """
         return self._eeprom.get_mac()
 
-    def get_serial_number(self):
+    def get_serial(self):
         """
         Retrieves the hardware serial number for the chassis
         Returns:

device/accton/x86_64-accton_as7312_54x-r0/Accton-AS7312-54X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7312-48x25G+6x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7312_54xs-r0/Accton-AS7312-54XS/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7312-48x25G+6x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7315_27xb-r0/Accton-AS7315-27XB/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/qax-as7315-20x10G+4x25G+3x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-as7326-48x25G+8x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7326_56x-r0/plugins/sfputil.py

@@ -47,16 +47,16 @@ class SfpUtil(SfpUtilBase):
            8:  50,
            9:  48,
            10:  49,
-           11:  51,
-           12:  52,
+           11:  52,
+           12:  51,
            13:  53,
            14:  56,
            15:  55,
            16:  54,
            17:  58,
            18:  57,
-           19:  59,
-           20:  60,
+           19:  60,
+           20:  59,
            21:  61,
            22:  63,
            23:  62,

device/accton/x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7712-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7716-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7716_32xb-r0/Accton-AS7716-32XB/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7716-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-as7726-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7816_64x-r0/Accton-AS7816-64X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-as7816-64x25G-48x100G_row1.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as9716_32d-r0/Accton-AS9716-32D/sai.profile

@@ -1 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th3-as9716-32x400G.config.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th3-as9716-32x400G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/alphanetworks/x86_64-alphanetworks_snh60a0_320fv2-r0/Alphanetworks-SNH60A0-320FV2/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-snh60a0-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/alphanetworks/x86_64-alphanetworks_snh60b0_640f-r0/Alphanetworks-SNH60B0-640F/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-snh60b0-64x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/arista/x86_64-arista_7050_qx32/pmon_daemon_control.json

@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json

device/arista/x86_64-arista_7050_qx32/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json

device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32s-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-q31s4-31x40G-4x10G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/arista/x86_64-arista_7050_qx32s/plugins/eeprom.py

@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/eeprom.py

device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py

@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/led_control.py