Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from Azure:master #1056

Merged
merged 2 commits into from
Oct 18, 2020
Merged

[pull] master from Azure:master #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f59a6e
[Mellanox] Configure SAI to log to syslog instead of stdout. (#5634)
stepanblyschak Oct 18, 2020
8011edc
[platform] Remove references to deprecated get_serial_number() method…
jleveque Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 1 addition & 9 deletions device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):
"""
Expand Down
2 changes: 1 addition & 1 deletion device/celestica/x86_64-cel_silverstone-r0/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 0 additions & 9 deletions platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,6 @@ def get_base_mac(self):
"""
return self._eeprom.base_mac_addr()

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.serial_number_str()

def get_system_eeprom_info(self):
"""
Retrieves the full content of system EEPROM information for the chassis
Expand Down
8 changes: 0 additions & 8 deletions platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,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
Expand Down
9 changes: 0 additions & 9 deletions platform/broadcom/sonic-platform-modules-inventec/d6356/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,6 @@ def get_base_mac(self):
"""
return self._eeprom.base_mac_address()

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.serial_number_str()

def get_system_eeprom_info(self):
"""
Retrieves the full content of system EEPROM information for the chassis
Expand Down
9 changes: 0 additions & 9 deletions platform/broadcom/sonic-platform-modules-inventec/d7054q28b/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,6 @@ def get_base_mac(self):
"""
return self._eeprom.base_mac_addr()

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.serial_number_str()

def get_system_eeprom_info(self):
"""
Retrieves the full content of system EEPROM information for the chassis
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-juniper/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def get_part_number(self):
return False


def get_serial_number(self):
def get_serial(self):
serial_number_list = self.get_parameter_value('Serial Number')
if serial_number_list:
serial_number = ''.join(serial_number_list)
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def get_base_mac(self):
return self._eeprom.get_base_mac()


def get_serial_number(self):
def get_serial(self):
"""
Retrieves the hardware serial number for the chassis

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
pushd mlnx_sai

chmod a+x autogen.sh
debuild -e 'make_extra_flags="DEFS=-DACS_OS"' -us -uc -d -b
debuild -e 'make_extra_flags="DEFS=-DACS_OS -DCONFIG_SYSLOG"' -us -uc -d -b
popd

mv $(DERIVED_TARGETS) $* $(DEST)/
Expand Down