Merge branch 'master' into phy-mibs

sonic-net · Oct 26, 2020 · 7b27c7c · 7b27c7c
2 parents 30bad8c + 5486f87
commit 7b27c7c
Show file tree

Hide file tree

Showing 362 changed files with 35,338 additions and 2,279 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -318,11 +318,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     haveged                 \
     jq
 
-# Install "wheel" package so that we can install .whl packages and not
-# encounter a "error: invalid command 'bdist_wheel'" error
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install wheel
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install wheel
-
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \

diff --git a/device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/chassis.py b/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:

diff --git a/device/arista/x86_64-arista_7050_qx32/pmon_daemon_control.json b/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
diff --git a/device/arista/x86_64-arista_7050_qx32/thermal_policy.json b/device/arista/x86_64-arista_7050_qx32/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7050_qx32s/pmon_daemon_control.json b/device/arista/x86_64-arista_7050_qx32s/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7050_qx32s/thermal_policy.json b/device/arista/x86_64-arista_7050_qx32s/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7050cx3_32s/pmon_daemon_control.json b/device/arista/x86_64-arista_7050cx3_32s/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7050cx3_32s/thermal_policy.json b/device/arista/x86_64-arista_7050cx3_32s/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7060_cx32s/pmon_daemon_control.json b/device/arista/x86_64-arista_7060_cx32s/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7060_cx32s/thermal_policy.json b/device/arista/x86_64-arista_7060_cx32s/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7060cx2_32s/pmon_daemon_control.json b/device/arista/x86_64-arista_7060cx2_32s/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7060cx2_32s/thermal_policy.json b/device/arista/x86_64-arista_7060cx2_32s/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7060px4_32/pmon_daemon_control.json b/device/arista/x86_64-arista_7060px4_32/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7060px4_32/thermal_policy.json b/device/arista/x86_64-arista_7060px4_32/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7170_32c/pmon_daemon_control.json b/device/arista/x86_64-arista_7170_32c/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7170_32c/thermal_policy.json b/device/arista/x86_64-arista_7170_32c/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7170_32cd/pmon_daemon_control.json b/device/arista/x86_64-arista_7170_32cd/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7170_32cd/thermal_policy.json b/device/arista/x86_64-arista_7170_32cd/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7170_64c/pmon_daemon_control.json b/device/arista/x86_64-arista_7170_64c/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7170_64c/thermal_policy.json b/device/arista/x86_64-arista_7170_64c/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7260cx3_64/pmon_daemon_control.json b/device/arista/x86_64-arista_7260cx3_64/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7260cx3_64/thermal_policy.json b/device/arista/x86_64-arista_7260cx3_64/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7280cr3_32d4/pmon_daemon_control.json b/device/arista/x86_64-arista_7280cr3_32d4/pmon_daemon_control.json
@@ -0,0 +1 @@
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7280cr3_32d4/thermal_policy.json b/device/arista/x86_64-arista_7280cr3_32d4/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7280cr3_32p4/pmon_daemon_control.json b/device/arista/x86_64-arista_7280cr3_32p4/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
+../x86_64-arista_common/pmon_daemon_control.json
diff --git a/device/arista/x86_64-arista_7280cr3_32p4/thermal_policy.json b/device/arista/x86_64-arista_7280cr3_32p4/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
diff --git a/device/arista/x86_64-arista_7800_sup/chassisdb.conf b/device/arista/x86_64-arista_7800_sup/chassisdb.conf
@@ -0,0 +1,2 @@
+start_chassis_db=1
+chassis_db_address=127.100.1.1
diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/chassisdb.conf b/device/arista/x86_64-arista_7800r3_48cq2_lc/chassisdb.conf
@@ -0,0 +1 @@
+chassis_db_address=127.100.1.1
diff --git a/device/arista/x86_64-arista_common/pmon_daemon_control.json b/device/arista/x86_64-arista_common/pmon_daemon_control.json
@@ -0,0 +1,4 @@
+{
+    "skip_fancontrol": true
+}
+
diff --git a/device/arista/x86_64-arista_common/thermal_policy.json b/device/arista/x86_64-arista_common/thermal_policy.json
@@ -0,0 +1,60 @@
+{
+    "thermal_control_algorithm": {
+        "run_at_boot_up": "true",
+        "fan_speed_when_suspend": "100"
+    },
+    "info_types": [
+        {
+            "type": "control_info"
+        },
+        {
+            "type": "fan_info"
+        },
+        {
+            "type": "thermal_info"
+        }
+    ],
+    "policies": [
+        {
+            "name": "any thermal critical",
+            "conditions": [
+                {
+                    "type": "thermal.any.critical"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "fan.all.set_speed",
+                    "speed": "100"
+                }
+            ]
+        },
+        {
+            "name": "any thermal overheat",
+            "conditions": [
+                {
+                    "type": "thermal.any.overheat"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "fan.all.set_speed",
+                    "speed": "100"
+                }
+            ]
+        },
+        {
+            "name": "normal operations",
+            "conditions": [
+                {
+                    "type": "normal"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control"
+                }
+            ]
+        }
+    ]
+}
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
@@ -87,7 +87,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:

diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
@@ -91,14 +91,6 @@ def get_base_mac(self):
         """
         return self._eeprom.get_mac()
 
-    def get_serial_number(self):
-        """
-        Retrieves the hardware serial number for the chassis
-        Returns:
-            A string containing the hardware serial number for this chassis.
-        """
-        return self._eeprom.get_serial()
-
     def get_system_eeprom_info(self):
         """
         Retrieves the full content of system EEPROM information for the chassis
@@ -252,7 +244,7 @@ def get_serial(self):
         Returns:
             string: Serial number of device
         """
-        return self.get_serial_number()
+        return self._eeprom.get_serial()
 
     def get_status(self):
         """

diff --git a/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/chassis.py
@@ -75,7 +75,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:

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/plugins/eeprom.py b/device/dell/x86_64-dell_s6100_c2538-r0/plugins/eeprom.py
@@ -11,8 +11,8 @@
 
 try:
     from sonic_eeprom import eeprom_tlvinfo
-except ImportError, e:
-    raise ImportError (str(e) + "- required module not found")
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
 
 
 class board(eeprom_tlvinfo.TlvInfoDecoder):

diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/plugins/eeprom.py b/device/dell/x86_64-dell_z9100_c2538-r0/plugins/eeprom.py
@@ -11,8 +11,8 @@
 
 try:
     from sonic_eeprom import eeprom_tlvinfo
-except ImportError, e:
-    raise ImportError (str(e) + "- required module not found")
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
 
 
 class board(eeprom_tlvinfo.TlvInfoDecoder):

diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2
@@ -1,16 +1,15 @@
-
-{%- set default_cable = '40m' %}
+{%- set default_cable = '5m' %}
 
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "28550336",
+            "size": "26284032",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "4194112"
+            "xoff": "6291456"
         },
-        "egress_pool": {
-            "size": "28550336",
+        "egress_lossless_pool": {
+            "size": "32575488",
             "type": "egress",
             "mode": "static"
         }
@@ -22,13 +21,13 @@
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_pool]",
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
             "mode": "static",
-            "static_th":"32744448"
+            "static_th":"32575488"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_pool]",
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
             "mode": "dynamic",
             "dynamic_th":"3"

diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t1.j2
@@ -1,16 +1,15 @@
-
 {%- set default_cable = '40m' %}
 
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "28550336",
+            "size": "26284032",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "4194112"
+            "xoff": "6291456"
         },
-        "egress_pool": {
-            "size": "28550336",
+        "egress_lossless_pool": {
+            "size": "32575488",
             "type": "egress",
             "mode": "static"
         }
@@ -22,13 +21,13 @@
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_pool]",
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
             "mode": "static",
-            "static_th":"32744448"
+            "static_th":"32575488"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_pool]",
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
             "mode": "dynamic",
             "dynamic_th":"3"

diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
@@ -541,6 +541,6 @@ dport_map_port_129=126
 dport_map_port_66=127
 dport_map_port_130=128
 
-mmu_init_config="TD3-DEFAULT-LOSSLESS-P3P4"
+mmu_init_config="TD3-DELL-lossless"
 sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
 
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/buffers_defaults_t0.j2
@@ -1,16 +1,15 @@
-
-{%- set default_cable = '40m' %}
+{%- set default_cable = '5m' %}
 
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "28550336",
+            "size": "26284032",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "4194112"
+            "xoff": "6291456"
         },
-        "egress_pool": {
-            "size": "28550336",
+        "egress_lossless_pool": {
+            "size": "32575488",
             "type": "egress",
             "mode": "static"
         }
@@ -22,13 +21,13 @@
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_pool]",
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
             "mode": "static",
-            "static_th":"32744448"
+            "static_th":"32575488"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_pool]",
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
             "mode": "dynamic",
             "dynamic_th":"3"