Merge PR 6824050

Author: Project Collection Build Service (msazure)

dockers/docker-sonic-mgmt/Dockerfile.j2

@@ -86,6 +86,7 @@ RUN pip install cffi==1.12.0 \
                 allure-pytest==2.8.22 \
                 celery[redis]==4.4.7 \
                 msrest==0.6.21 \
+                python-dateutil \
     && git clone https://github.com/p4lang/scapy-vxlan.git \
     && cd scapy-vxlan \
     && python setup.py install \
@@ -253,7 +254,8 @@ RUN python3 -m pip install setuptools-rust \
                             ptf \
                             scapy==2.4.5 \
                             celery[redis]==4.4.7 \
-                            msrest==0.6.21
+                            msrest==0.6.21 \
+                            python-dateutil
 
 # Deactivating a virtualenv
 ENV PATH="$BACKUP_OF_PATH"

platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py

@@ -123,7 +123,7 @@ def __del__(self):
 
         if self._sfp_list:
             if self.sfp_module.SFP.shared_sdk_handle:
-                self.sfp_module.deinitialize_sdk_handle(sfp_module.SFP.shared_sdk_handle)
+                self.sfp_module.deinitialize_sdk_handle(self.sfp_module.SFP.shared_sdk_handle)
 
     @property
     def RJ45_port_list(self):

platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py

@@ -359,16 +359,14 @@ def _read_eeprom_specific_bytes(self, offset, num_bytes):
         try:
             output = subprocess.check_output(ethtool_cmd,
                                              shell=True,
-                                             universal_newlines=True,
-                                             stderr=subprocess.PIPE)
+                                             universal_newlines=True)
             output_lines = output.splitlines()
             first_line_raw = output_lines[0]
             if "Offset" in first_line_raw:
                 for line in output_lines[2:]:
                     line_split = line.split()
                     eeprom_raw = eeprom_raw + line_split[1:]
         except subprocess.CalledProcessError as e:
-            logger.log_notice("Failed to get EEPROM data for sfp {}: {}".format(self.index, e.stderr))
             return None
 
         eeprom_raw = list(map(lambda h: int(h, base=16), eeprom_raw))