Skip to content

Commit 9edc598

Browse files
committed
Merge branch 'master' of https://github.com/Azure/sonic-buildimage into internal
2 parents 7447f32 + 4d317af commit 9edc598

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

dockers/docker-sonic-mgmt/Dockerfile.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ RUN pip install cffi==1.12.0 \
8686
allure-pytest==2.8.22 \
8787
celery[redis]==4.4.7 \
8888
msrest==0.6.21 \
89+
python-dateutil \
8990
&& git clone https://github.com/p4lang/scapy-vxlan.git \
9091
&& cd scapy-vxlan \
9192
&& python setup.py install \
@@ -253,7 +254,8 @@ RUN python3 -m pip install setuptools-rust \
253254
ptf \
254255
scapy==2.4.5 \
255256
celery[redis]==4.4.7 \
256-
msrest==0.6.21
257+
msrest==0.6.21 \
258+
python-dateutil
257259

258260
# Deactivating a virtualenv
259261
ENV PATH="$BACKUP_OF_PATH"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def __del__(self):
123123

124124
if self._sfp_list:
125125
if self.sfp_module.SFP.shared_sdk_handle:
126-
self.sfp_module.deinitialize_sdk_handle(sfp_module.SFP.shared_sdk_handle)
126+
self.sfp_module.deinitialize_sdk_handle(self.sfp_module.SFP.shared_sdk_handle)
127127

128128
@property
129129
def RJ45_port_list(self):

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,16 +359,14 @@ def _read_eeprom_specific_bytes(self, offset, num_bytes):
359359
try:
360360
output = subprocess.check_output(ethtool_cmd,
361361
shell=True,
362-
universal_newlines=True,
363-
stderr=subprocess.PIPE)
362+
universal_newlines=True)
364363
output_lines = output.splitlines()
365364
first_line_raw = output_lines[0]
366365
if "Offset" in first_line_raw:
367366
for line in output_lines[2:]:
368367
line_split = line.split()
369368
eeprom_raw = eeprom_raw + line_split[1:]
370369
except subprocess.CalledProcessError as e:
371-
logger.log_notice("Failed to get EEPROM data for sfp {}: {}".format(self.index, e.stderr))
372370
return None
373371

374372
eeprom_raw = list(map(lambda h: int(h, base=16), eeprom_raw))

0 commit comments

Comments
 (0)