From 178fc032ae45a17170a2c4fb22d0569dc139b63c Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Fri, 11 Aug 2017 11:36:32 -0700 Subject: [PATCH 1/7] [sfputil]: Add support for SFP presence, low-power mode and reset (#877) - Update sfputil plugins for Dell FORCE10-S6000, Arista 7050-QX-32, 7050-QX-32-S --- .../plugins/sfputil.py | 11 +- .../plugins/sfputil.py | 11 +- .../plugins/sfputil.py | 182 ++++++++++++++++-- files/image_config/sudoers/sudoers | 2 +- .../broadcom/sonic-platform-modules-arista | 2 +- src/sonic-utilities | 2 +- 6 files changed, 182 insertions(+), 28 deletions(-) diff --git a/device/arista/x86_64-arista_7050_qx32/plugins/sfputil.py b/device/arista/x86_64-arista_7050_qx32/plugins/sfputil.py index b85e0f5365..9a6d770d46 100644 --- a/device/arista/x86_64-arista_7050_qx32/plugins/sfputil.py +++ b/device/arista/x86_64-arista_7050_qx32/plugins/sfputil.py @@ -1,9 +1,12 @@ -#!/usr/bin/env python +# sfputil.py +# +# Platform-specific SFP transceiver interface for SONiC +# try: import arista.utils.sonic_sfputil as arista_sfputil -except ImportError, e: - raise ImportError (str(e) + "- required module not found") +except ImportError as e: + raise ImportError("%s - required module not found" % str(e)) -sfputil = arista_sfputil.getSfpUtil() +SfpUtil = arista_sfputil.getSfpUtil() diff --git a/device/arista/x86_64-arista_7050_qx32s/plugins/sfputil.py b/device/arista/x86_64-arista_7050_qx32s/plugins/sfputil.py index b85e0f5365..9a6d770d46 100644 --- a/device/arista/x86_64-arista_7050_qx32s/plugins/sfputil.py +++ b/device/arista/x86_64-arista_7050_qx32s/plugins/sfputil.py @@ -1,9 +1,12 @@ -#!/usr/bin/env python +# sfputil.py +# +# Platform-specific SFP transceiver interface for SONiC +# try: import arista.utils.sonic_sfputil as arista_sfputil -except ImportError, e: - raise ImportError (str(e) + "- required module not found") +except ImportError as e: + raise ImportError("%s - required module not found" % str(e)) -sfputil = arista_sfputil.getSfpUtil() +SfpUtil = arista_sfputil.getSfpUtil() diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py b/device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py index 8b1ec277d7..1f2b9e9f61 100644 --- a/device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py +++ b/device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py @@ -1,27 +1,175 @@ -#!/usr/bin/env python +# sfputil.py +# +# Platform-specific SFP transceiver interface for SONiC +# try: - from sonic_sfp.sfputilbase import sfputilbase -except ImportError, e: - raise ImportError (str(e) + "- required module not found") + import time + from sonic_sfp.sfputilbase import SfpUtilBase +except ImportError as e: + raise ImportError("%s - required module not found" % str(e)) -class sfputil(sfputilbase): - """Platform specific sfputil class""" +class SfpUtil(SfpUtilBase): + """Platform-specific SfpUtil class""" - port_start = 0 - port_end = 31 - ports_in_block = 32 + PORT_START = 0 + PORT_END = 31 + PORTS_IN_BLOCK = 32 - eeprom_offset = 20 + EEPROM_OFFSET = 20 - port_to_eeprom_mapping = {} + _port_to_eeprom_mapping = {} - _qsfp_ports = range(0, ports_in_block + 1) + @property + def port_start(self): + return self.PORT_START + + @property + def port_end(self): + return self.PORT_END + + @property + def qsfp_ports(self): + return range(0, self.PORTS_IN_BLOCK + 1) + + @property + def port_to_eeprom_mapping(self): + return self._port_to_eeprom_mapping + + def __init__(self): + eeprom_path = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom" - def __init__(self, port_num): - # Override port_to_eeprom_mapping for class initialization - eeprom_path = '/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom' for x in range(0, self.port_end + 1): - self.port_to_eeprom_mapping[x] = eeprom_path.format(x + self.eeprom_offset) - sfputilbase.__init__(self, port_num) + self._port_to_eeprom_mapping[x] = eeprom_path.format(x + self.EEPROM_OFFSET) + + SfpUtilBase.__init__(self) + + def get_presence(self, port_num): + # Check for invalid port_num + if port_num < self.port_start or port_num > self.port_end: + return False + + try: + reg_file = open("/sys/devices/platform/dell-s6000-cpld.0/qsfp_modprs") + except IOError as e: + print "Error: unable to open file: %s" % str(e) + return False + + content = reg_file.readline().rstrip() + + # content is a string containing the hex representation of the register + reg_value = int(content, 16) + + # Mask off the bit corresponding to our port + mask = (1 << port_num) + + # ModPrsL is active low + if reg_value & mask == 0: + return True + + return False + + def get_low_power_mode(self, port_num): + # Check for invalid port_num + if port_num < self.port_start or port_num > self.port_end: + return False + + try: + reg_file = open("/sys/devices/platform/dell-s6000-cpld.0/qsfp_lpmode") + except IOError as e: + print "Error: unable to open file: %s" % str(e) + + content = reg_file.readline().rstrip() + + # content is a string containing the hex representation of the register + reg_value = int(content, 16) + + # Mask off the bit corresponding to our port + mask = (1 << port_num) + + # LPMode is active high + if reg_value & mask == 0: + return False + + return True + + def set_low_power_mode(self, port_num, lpmode): + # Check for invalid port_num + if port_num < self.port_start or port_num > self.port_end: + return False + + try: + reg_file = open("/sys/devices/platform/dell-s6000-cpld.0/qsfp_lpmode", "r+") + except IOError as e: + print "Error: unable to open file: %s" % str(e) + return False + + content = reg_file.readline().rstrip() + + # content is a string containing the hex representation of the register + reg_value = int(content, 16) + + # Mask off the bit corresponding to our port + mask = (1 << port_num) + + # LPMode is active high; set or clear the bit accordingly + if lpmode is True: + reg_value = reg_value | mask + else: + reg_value = reg_value & ~mask + + # Convert our register value back to a hex string and write back + content = hex(reg_value) + + reg_file.seek(0) + reg_file.write(content) + reg_file.close() + + return True + + def reset(self, port_num): + QSFP_RESET_REGISTER_DEVICE_FILE = "/sys/devices/platform/dell-s6000-cpld.0/qsfp_reset" + + # Check for invalid port_num + if port_num < self.port_start or port_num > self.port_end: + return False + + try: + reg_file = open(QSFP_RESET_REGISTER_DEVICE_FILE, "r+") + except IOError as e: + print "Error: unable to open file: %s" % str(e) + return False + + content = reg_file.readline().rstrip() + + # File content is a string containing the hex representation of the register + reg_value = int(content, 16) + + # Mask off the bit corresponding to our port + mask = (1 << port_num) + + # ResetL is active low + reg_value = reg_value & ~mask + + # Convert our register value back to a hex string and write back + reg_file.seek(0) + reg_file.write(hex(reg_value)) + reg_file.close() + + # Sleep 1 second to allow it to settle + time.sleep(1) + + # Flip the bit back high and write back to the register to take port out of reset + try: + reg_file = open(QSFP_RESET_REGISTER_DEVICE_FILE, "w") + except IOError as e: + print "Error: unable to open file: %s" % str(e) + return False + + reg_value = reg_value | mask + reg_file.seek(0) + reg_file.write(hex(reg_value)) + reg_file.close() + + return True diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers index cfff38b502..715a1979f1 100644 --- a/files/image_config/sudoers/sudoers +++ b/files/image_config/sudoers/sudoers @@ -25,7 +25,7 @@ Cmnd_Alias READ_ONLY_CMDS = /usr/bin/decode-syseeprom, \ /usr/bin/lldpctl, \ /usr/bin/lldpshow, \ /usr/bin/sensors, \ - /usr/bin/sfputil, \ + /usr/bin/sfputil show *, \ /usr/bin/vtysh -c show *, \ /bin/cat /var/log/syslog, \ /usr/bin/tail -f /var/log/syslog diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index a90b9fc5b0..51bbe2cd86 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit a90b9fc5b085cdb99d10d338a23daa66c7f351b2 +Subproject commit 51bbe2cd86af7df20b27e0cd1f02c2ad08ab2f03 diff --git a/src/sonic-utilities b/src/sonic-utilities index c7f6ff677b..ac7ea4f3b9 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit c7f6ff677b54eb401e7b2fd3a3d9c4072325bb78 +Subproject commit ac7ea4f3b9dcc5cef15cc7ec0e796cde8a7f8ab8 From 49feeaa4568731f475fcb46d224c2544b6942bcc Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Mon, 14 Aug 2017 10:25:50 -0700 Subject: [PATCH 2/7] [LEDs]: Initialize status and fan LEDs to green on Arista 7050-QX-32/7050-QX-32-S (#886) --- .../plugins/led_control.py | 20 ++++++++++++++++++ .../plugins/led_control.py | 21 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py b/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py index 1c69d8109f..1f6034e2e2 100644 --- a/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py +++ b/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py @@ -75,6 +75,26 @@ class LedControl(LedControlBase): # Constructor def __init__(self): + # Initialize all front-panel status LEDs to green + with open("/sys/class/leds/status/brightness", "w") as f: + f.write("1") + with open("/sys/class/leds/fan_status/brightness", "w") as f: + f.write("1") + with open("/sys/class/leds/psu1/brightness", "w") as f: + f.write("1") + with open("/sys/class/leds/psu2/brightness", "w") as f: + f.write("1") + + # Initialize all fan LEDs to green + with open("/sys/devices/platform/sb800-fans/hwmon/hwmon1/fan1_led", "w") as f: + f.write("3") + with open("/sys/devices/platform/sb800-fans/hwmon/hwmon1/fan2_led", "w") as f: + f.write("3") + with open("/sys/devices/platform/sb800-fans/hwmon/hwmon1/fan3_led", "w") as f: + f.write("3") + with open("/sys/devices/platform/sb800-fans/hwmon/hwmon1/fan4_led", "w") as f: + f.write("3") + # Initialize: Turn all front panel QSFP LEDs off for qsfp_index in range(self.QSFP_BREAKOUT_START_IDX, self.QSFP_BREAKOUT_END_IDX + 1): for lane in range(1, 5): diff --git a/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py b/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py index 839092ee1d..f2cb73194e 100644 --- a/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py +++ b/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py @@ -70,6 +70,27 @@ class LedControl(LedControlBase): # Constructor def __init__(self): + # Initialize all front-panel status LEDs to green + with open("/sys/class/leds/status/brightness", "w") as f: + f.write("1") + with open("/sys/class/leds/fan_status/brightness", "w") as f: + f.write("1") + with open("/sys/class/leds/psu1/brightness", "w") as f: + f.write("1") + with open("/sys/class/leds/psu2/brightness", "w") as f: + f.write("1") + + # Initialize all fan LEDs to green + with open("/sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060/hwmon/hwmon2/fan1_led", "w") as f: + f.write("1") + with open("/sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060/hwmon/hwmon2/fan2_led", "w") as f: + f.write("1") + with open("/sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060/hwmon/hwmon2/fan3_led", "w") as f: + f.write("1") + with open("/sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060/hwmon/hwmon2/fan4_led", "w") as f: + f.write("1") + + # Initialize: Turn all front panel QSFP LEDs off for qsfp_index in range(self.QSFP_BREAKOUT_START_IDX, self.QSFP_BREAKOUT_END_IDX + 1): for lane in range(1, 5): From 232acbf2176eb489ff0b80e2ebfb7a0966a3162b Mon Sep 17 00:00:00 2001 From: Oleksandr Ivantsiv Date: Mon, 14 Aug 2017 21:41:44 +0300 Subject: [PATCH 3/7] [submodule] update sonic-swss submodule (#885) --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index ab31a9af7e..f9b55d3027 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit ab31a9af7ef2c5ea9fe5f0f89f0a61b3ec0f83bf +Subproject commit f9b55d30276d1a6ab94e7321d9b2a3bf076fd683 From c299fe472d35077fe932d592c9e5c2b3fdebd3b3 Mon Sep 17 00:00:00 2001 From: pavel-shirshov Date: Mon, 14 Aug 2017 15:56:40 -0700 Subject: [PATCH 4/7] Update sonic-utilities (#887) --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index ac7ea4f3b9..18bb5ed74c 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit ac7ea4f3b9dcc5cef15cc7ec0e796cde8a7f8ab8 +Subproject commit 18bb5ed74cb40c5205cdc0a553ce79c02a541272 From f938f3ecafcb9fde755508da721424b31269e76c Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Tue, 15 Aug 2017 10:38:22 -0700 Subject: [PATCH 5/7] [docker-platform-monitor]: Prevent supervisor from logging unexpected exits from processes known to exit in < 1 second (#889) --- dockers/docker-platform-monitor/supervisord.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dockers/docker-platform-monitor/supervisord.conf b/dockers/docker-platform-monitor/supervisord.conf index 6fb73450af..0a05e61eff 100644 --- a/dockers/docker-platform-monitor/supervisord.conf +++ b/dockers/docker-platform-monitor/supervisord.conf @@ -10,6 +10,7 @@ autostart=true autorestart=false stdout_logfile=syslog stderr_logfile=syslog +startsecs=0 [program:rsyslogd] command=/usr/sbin/rsyslogd -n @@ -26,6 +27,7 @@ autostart=false autorestart=false stdout_logfile=syslog stderr_logfile=syslog +startsecs=0 [program:fancontrol] command=/usr/sbin/fancontrol @@ -41,3 +43,4 @@ priority=5 autostart=false stdout_logfile=syslog stderr_logfile=syslog +startsecs=0 From 3a8f5be19a1b4978c415e37a4817e61ecd549b87 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Tue, 15 Aug 2017 10:38:49 -0700 Subject: [PATCH 6/7] [docker-database]: Start rsyslogd to allow supervisor to log to syslog (#890) --- dockers/docker-database/supervisord.conf | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dockers/docker-database/supervisord.conf b/dockers/docker-database/supervisord.conf index 42b0eddac0..9ad7ff32bc 100644 --- a/dockers/docker-database/supervisord.conf +++ b/dockers/docker-database/supervisord.conf @@ -3,9 +3,17 @@ logfile_maxbytes=1MB logfile_backups=2 nodaemon=true +[program:rsyslogd] +command=/usr/sbin/rsyslogd -n +priority=1 +autostart=true +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog + [program:redis-server] command=/usr/bin/redis-server /etc/redis/redis.conf -priority=1 +priority=2 autostart=true autorestart=false stdout_logfile=syslog @@ -13,9 +21,8 @@ stderr_logfile=syslog [program:configdb-load.sh] command=/usr/bin/configdb-load.sh -priority=2 +priority=3 autostart=true autorestart=false stdout_logfile=syslog stderr_logfile=syslog - From 693ad9c4eea816cc060bf74320abfd6242ff4812 Mon Sep 17 00:00:00 2001 From: Shuotian Cheng Date: Tue, 15 Aug 2017 12:10:43 -0700 Subject: [PATCH 7/7] [quagga]: Update sonic-quagga submodule (#892) - [bgpd]: Enable forwarding state flag in graceful restart capability - [debian]: Add autoreconf_clean --- src/sonic-quagga | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-quagga b/src/sonic-quagga index df6b70902b..b066bef0e8 160000 --- a/src/sonic-quagga +++ b/src/sonic-quagga @@ -1 +1 @@ -Subproject commit df6b70902b4c29447ac52277cf6d5b7f6abca71e +Subproject commit b066bef0e8dcf23b8e1751652397c09e61ee4bdd