Merge remote-tracking branch 'github/master' into v1.0.3-backup

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):

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:
+except ImportError as e:
-    raise ImportError (str(e) + "- required module not found")
+    raise ImportError("%s - required module not found" % str(e))
 
 
-sfputil = arista_sfputil.getSfpUtil()
+SfpUtil = arista_sfputil.getSfpUtil()

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):

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:
+except ImportError as e:
-    raise ImportError (str(e) + "- required module not found")
+    raise ImportError("%s - required module not found" % str(e))
 
 
-sfputil = arista_sfputil.getSfpUtil()
+SfpUtil = arista_sfputil.getSfpUtil()

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
+    import time
-except ImportError, e:
+    from sonic_sfp.sfputilbase import SfpUtilBase
-    raise ImportError (str(e) + "- required module not found")
+except ImportError as e:
+    raise ImportError("%s - required module not found" % str(e))
 
 
-class sfputil(sfputilbase):
+class SfpUtil(SfpUtilBase):
-    """Platform specific sfputil class"""
+    """Platform-specific SfpUtil class"""
 
-    port_start = 0
+    PORT_START = 0
-    port_end = 31
+    PORT_END = 31
-    ports_in_block = 32
+    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)
+            self._port_to_eeprom_mapping[x] = eeprom_path.format(x + self.EEPROM_OFFSET)
-        sfputilbase.__init__(self, port_num)
+
+        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

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
-

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

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

platform/broadcom/sonic-platform-modules-arista

@@ -1 +1 @@
-Subproject commit a90b9fc5b085cdb99d10d338a23daa66c7f351b2
+Subproject commit 51bbe2cd86af7df20b27e0cd1f02c2ad08ab2f03

src/sonic-utilities

@@ -1 +1 @@
-Subproject commit ac7ea4f3b9dcc5cef15cc7ec0e796cde8a7f8ab8
+Subproject commit 51fc8ee36b736c7644d812c3b0ad63206456d7e2