Merging latest changes from Azure - 2019-08-13

build_debian.sh

@@ -214,9 +214,11 @@ sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker $USERNAME -c "$DEFAUL
 ## Create password for the default user
 echo "$USERNAME:$PASSWORD" | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd
 
-## Pre-install hardware drivers
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install      \
-    firmware-linux-nonfree
+if [[ $CONFIGURED_ARCH == amd64 ]]; then
+    ## Pre-install hardware drivers
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install      \
+        firmware-linux-nonfree
+fi
 
 ## Pre-install the fundamental packages
 ## Note: gdisk is needed for sgdisk in install.sh
@@ -268,9 +270,14 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     tcptraceroute           \
     mtr-tiny                \
     locales                 \
+    cgroup-tools
+
+if [[ $CONFIGURED_ARCH == amd64 ]]; then
+## Pre-install the fundamental packages for amd64 (x86)
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
     flashrom                \
-    cgroup-tools            \
     mcelog
+fi
 
 #Adds a locale to a debian system in non-interactive mode
 sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
@@ -403,8 +410,10 @@ set /files/etc/sysctl.conf/net.core.rmem_max 2097152
 set /files/etc/sysctl.conf/net.core.wmem_max 2097152
 " -r $FILESYSTEM_ROOT
 
-# Configure mcelog to log machine checks to syslog
-sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
+if [[ $CONFIGURED_ARCH == amd64 ]]; then
+    # Configure mcelog to log machine checks to syslog
+    sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
+fi
 
 ## docker-py is needed by Ansible docker module
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT easy_install pip

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers_defaults_t0.j2

@@ -19,7 +19,7 @@
         "ingress_lossless_pool": {
             "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
-            "mode": "dynamic"
+            "mode": "static"
         },
         "ingress_lossy_pool": {
             "size": "{{ ingress_lossy_pool_size }}",
@@ -29,7 +29,7 @@
         "egress_lossless_pool": {
             "size": "{{ egress_lossless_pool_size }}",
             "type": "egress",
-            "mode": "dynamic"
+            "mode": "static"
         },
         "egress_lossy_pool": {
             "size": "{{ egress_lossy_pool_size }}",

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers_defaults_t1.j2

@@ -19,7 +19,7 @@
         "ingress_lossless_pool": {
             "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
-            "mode": "dynamic"
+            "mode": "static"
         },
         "ingress_lossy_pool": {
             "size": "{{ ingress_lossy_pool_size }}",
@@ -29,7 +29,7 @@
         "egress_lossless_pool": {
             "size": "{{ egress_lossless_pool_size }}",
             "type": "egress",
-            "mode": "dynamic"
+            "mode": "static"
         },
         "egress_lossy_pool": {
             "size": "{{ egress_lossy_pool_size }}",

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.ini

@@ -1,55 +1,55 @@
-# name          lanes             alias             index
-Ethernet0       8                 Ethernet1/1       0
-Ethernet1       9                 Ethernet2/1       1
-Ethernet2       10                Ethernet3/1       2
-Ethernet3       11                Ethernet4/1       3
-Ethernet4       12                Ethernet5/1       4
-Ethernet5       13                Ethernet6/1       5
-Ethernet6       14                Ethernet7/1       6
-Ethernet7       15                Ethernet8/1       7
-Ethernet8       16                Ethernet9/1       8
-Ethernet9       17                Ethernet10/1      9
-Ethernet10      18                Ethernet11/1      10
-Ethernet11      19                Ethernet12/1      11
-Ethernet12      20                Ethernet13/1      12
-Ethernet13      21                Ethernet14/1      13
-Ethernet14      22                Ethernet15/1      14
-Ethernet15      23                Ethernet16/1      15
-Ethernet16      32                Ethernet17/1      16
-Ethernet17      33                Ethernet18/1      17
-Ethernet18      34                Ethernet19/1      18
-Ethernet19      35                Ethernet20/1      19
-Ethernet20      40                Ethernet21/1      20
-Ethernet21      41                Ethernet22/1      21
-Ethernet22      42                Ethernet23/1      22
-Ethernet23      43                Ethernet24/1      23
-Ethernet24      48                Ethernet25/1      24
-Ethernet25      49                Ethernet26/1      25
-Ethernet26      50                Ethernet27/1      26
-Ethernet27      51                Ethernet28/1      27
-Ethernet28      56                Ethernet29/1      28
-Ethernet29      57                Ethernet30/1      29
-Ethernet30      58                Ethernet31/1      30
-Ethernet31      59                Ethernet32/1      31
-Ethernet32      64                Ethernet33/1      32
-Ethernet33      65                Ethernet34/1      33
-Ethernet34      66                Ethernet35/1      34
-Ethernet35      67                Ethernet36/1      35
-Ethernet36      68                Ethernet37/1      36
-Ethernet37      69                Ethernet38/1      37
-Ethernet38      70                Ethernet39/1      38
-Ethernet39      71                Ethernet40/1      39
-Ethernet40      72                Ethernet41/1      40
-Ethernet41      73                Ethernet42/1      41
-Ethernet42      74                Ethernet43/1      42
-Ethernet43      75                Ethernet44/1      43
-Ethernet44      76                Ethernet45/1      44
-Ethernet45      77                Ethernet46/1      45
-Ethernet46      78                Ethernet47/1      46
-Ethernet47      79                Ethernet48/1      47
-Ethernet48      84,85,86,87       Ethernet49/1      48
-Ethernet49      80,81,82,83       Ethernet50/1      49
-Ethernet50      104,105,106,107   Ethernet51/1      50
-Ethernet51      108,109,110,111   Ethernet52/1      51
-Ethernet52      112,113,114,115   Ethernet53/1      52
-Ethernet53      116,117,118,119   Ethernet54/1      53
+# name          lanes             alias             index           speed
+Ethernet0       8                 Ethernet1/1       0               25000
+Ethernet1       9                 Ethernet2/1       1               25000
+Ethernet2       10                Ethernet3/1       2               25000
+Ethernet3       11                Ethernet4/1       3               25000
+Ethernet4       12                Ethernet5/1       4               25000
+Ethernet5       13                Ethernet6/1       5               25000
+Ethernet6       14                Ethernet7/1       6               25000
+Ethernet7       15                Ethernet8/1       7               25000
+Ethernet8       16                Ethernet9/1       8               25000
+Ethernet9       17                Ethernet10/1      9               25000
+Ethernet10      18                Ethernet11/1      10              25000
+Ethernet11      19                Ethernet12/1      11              25000
+Ethernet12      20                Ethernet13/1      12              25000
+Ethernet13      21                Ethernet14/1      13              25000
+Ethernet14      22                Ethernet15/1      14              25000
+Ethernet15      23                Ethernet16/1      15              25000
+Ethernet16      32                Ethernet17/1      16              25000
+Ethernet17      33                Ethernet18/1      17              25000
+Ethernet18      34                Ethernet19/1      18              25000
+Ethernet19      35                Ethernet20/1      19              25000
+Ethernet20      40                Ethernet21/1      20              25000
+Ethernet21      41                Ethernet22/1      21              25000
+Ethernet22      42                Ethernet23/1      22              25000
+Ethernet23      43                Ethernet24/1      23              25000
+Ethernet24      48                Ethernet25/1      24              25000
+Ethernet25      49                Ethernet26/1      25              25000
+Ethernet26      50                Ethernet27/1      26              25000
+Ethernet27      51                Ethernet28/1      27              25000
+Ethernet28      56                Ethernet29/1      28              25000
+Ethernet29      57                Ethernet30/1      29              25000
+Ethernet30      58                Ethernet31/1      30              25000
+Ethernet31      59                Ethernet32/1      31              25000
+Ethernet32      64                Ethernet33/1      32              25000
+Ethernet33      65                Ethernet34/1      33              25000
+Ethernet34      66                Ethernet35/1      34              25000
+Ethernet35      67                Ethernet36/1      35              25000
+Ethernet36      68                Ethernet37/1      36              25000
+Ethernet37      69                Ethernet38/1      37              25000
+Ethernet38      70                Ethernet39/1      38              25000
+Ethernet39      71                Ethernet40/1      39              25000
+Ethernet40      72                Ethernet41/1      40              25000
+Ethernet41      73                Ethernet42/1      41              25000
+Ethernet42      74                Ethernet43/1      42              25000
+Ethernet43      75                Ethernet44/1      43              25000
+Ethernet44      76                Ethernet45/1      44              25000
+Ethernet45      77                Ethernet46/1      45              25000
+Ethernet46      78                Ethernet47/1      46              25000
+Ethernet47      79                Ethernet48/1      47              25000
+Ethernet48      84,85,86,87       Ethernet49/1      48              100000
+Ethernet49      80,81,82,83       Ethernet50/1      49              100000
+Ethernet50      104,105,106,107   Ethernet51/1      50              100000
+Ethernet51      108,109,110,111   Ethernet52/1      51              100000
+Ethernet52      112,113,114,115   Ethernet53/1      52              100000
+Ethernet53      116,117,118,119   Ethernet54/1      53              100000

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps

@@ -410,5 +410,5 @@ port set property portlist=48-53 medium-type=sr4
 port set property portlist=129-130 medium-type=kr
 port set adver portlist=129-130 speed-10g-kr
 port set property portlist=129-130 an=enable
-port set property portlist=0-53,129-130 admin=enable
-
+port set property unit=0 portlist=129-130 admin=enable
+port set property unit=0 portlist=0-53 admin=disable

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/sai.profile

@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/platform/led_proc_init.nps
-SAI_DSH_CONFIG_FILE=/usr/share/sonic/hwsku/port_config.nps
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/proc_init.nps
+SAI_DSH_CONFIG_FILE=/usr/share/sonic/hwsku/port_config.nps

device/accton/x86_64-accton_as7116_54x-r0/default_sku

@@ -1 +1 @@
-Accton-AS7116-54X t1
+Accton-AS7116-54X t1

device/accton/x86_64-accton_as7116_54x-r0/fancontrol

@@ -0,0 +1,10 @@
+INTERVAL=10
+FCTEMPS=/sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=/sys/bus/i2c/devices/20-004a/hwmon/hwmon*/temp1_input /sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=/sys/bus/i2c/devices/19-0049/hwmon/hwmon*/temp1_input /sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=/sys/bus/i2c/devices/17-004b/hwmon/hwmon*/temp1_input
+FCFANS=/sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=/sys/bus/i2c/devices/1-0063/fan1_input /sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=/sys/bus/i2c/devices/1-0063/fan2_input
+/sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=/sys/bus/i2c/devices/1-0063/fan3_input /sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=/sys/bus/i2c/devices/1-0063/fan4_input /sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=/sys/bus/i2c/devices/1-0063/fan5_input
+MINTEMP=/sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=49
+MAXTEMP=/sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=58
+MINSTART=/sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=100
+MINSTOP=/sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=40
+MINPWM=/sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=40
+MAXPWM=/sys/bus/i2c/devices/1-0063/fan_duty_cycle_percentage=100

device/accton/x86_64-accton_as7116_54x-r0/plugins/eeprom.py

@@ -18,4 +18,4 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     _TLV_INFO_MAX_LEN = 256
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/sys/bus/i2c/devices/0-0056/eeprom"
-        super(board, self).__init__(self.eeprom_path, 0, '', True)
+        super(board, self).__init__(self.eeprom_path, 0, '', True)

device/accton/x86_64-accton_as7116_54x-r0/plugins/sfputil.py

@@ -6,6 +6,8 @@
 except ImportError, e:
     raise ImportError (str(e) + "- required module not found")
 
+SFP_STATUS_INSERTED = '1'
+SFP_STATUS_REMOVED = '0'
 
 class SfpUtil(SfpUtilBase):
     """Platform specific SfpUtill class"""
@@ -75,17 +77,21 @@ class SfpUtil(SfpUtilBase):
 
     _qsfp_ports = range(_qsfp_port_start, _ports_in_block + 1)
 
+    _present_status = dict()
+
     def __init__(self):
         eeprom_path = '/sys/bus/i2c/devices/{0}-0050/sfp_eeprom'
         for x in range(self._port_start, self._port_end + 1):
             port_eeprom_path = eeprom_path.format(self._port_to_i2c_mapping[x])
-            self._port_to_eeprom_mapping[x] = port_eeprom_path
-
-            SfpUtilBase.__init__(self)
-
+            self._port_to_eeprom_mapping[x] = port_eeprom_path 
+            self._present_status[x] = SFP_STATUS_REMOVED
+
+        SfpUtilBase.__init__(self)
+
     def reset(self, port_num):
         # Check for invalid port_num
-        if port_num < self._port_start or port_num > self._port_end:
+        if port_num < self._qsfp_port_start or port_num > self._port_end:
+            print "Error: port %d is not qsfp port" % port_num
             return False
 
         path = "/sys/bus/i2c/devices/{0}-0050/sfp_port_reset"
@@ -111,7 +117,7 @@ def set_low_power_mode(self, port_nuM, lpmode):
 
     def get_low_power_mode(self, port_num):
         raise NotImplementedError
-        
+
     def get_presence(self, port_num):
         # Check for invalid port_num
         if port_num < self._port_start or port_num > self._port_end:
@@ -151,3 +157,15 @@ def qsfp_ports(self):
     @property 
     def port_to_eeprom_mapping(self):
          return self._port_to_eeprom_mapping
+
+    def get_transceiver_change_event(self, timeout=0):
+        ret_present = dict()
+        for phy_port in range(self._port_start, self._port_end + 1):
+            last_present_status = SFP_STATUS_INSERTED if self.get_presence(phy_port) else SFP_STATUS_REMOVED
+            if self._present_status[phy_port] != last_present_status:
+            	ret_present[phy_port] = last_present_status
+            	self._present_status[phy_port] = last_present_status
+
+        time.sleep(2)
+
+        return True, ret_present

device/accton/x86_64-accton_as7116_54x-r0/sensors.conf

@@ -10,4 +10,4 @@ chip "as7116_54x_fan-*"
     label fan7 "rear fan 2"
     label fan8 "rear fan 3"
     label fan9 "rear fan 4"
-    label fan10 "rear fan 5"
+    label fan10 "rear fan 5"

device/accton/x86_64-accton_as7315_27xb-r0/Accton-AS7315-27XB/port_config.ini

@@ -0,0 +1,28 @@
+# name          lanes                 alias             index  speed
+Ethernet0       28                    twentyfiveGigE1   1       25000
+Ethernet1       29                    twentyfiveGigE2   2       25000
+Ethernet2       30                    twentyfiveGigE3   3       25000
+Ethernet3       31                    twentyfiveGigE4   4       25000
+Ethernet4       24                    twentyfiveGigE5   5       10000
+Ethernet5       25                    twentyfiveGigE6   6       10000
+Ethernet6       26                    twentyfiveGigE7   7       10000
+Ethernet7       27                    twentyfiveGigE8   8       10000
+Ethernet8       20                    twentyfiveGigE9   9       10000
+Ethernet9       21                    twentyfiveGigE10  10      10000
+Ethernet10      22                    twentyfiveGigE11  11      10000
+Ethernet11      23                    twentyfiveGigE12  12      10000
+Ethernet12      16                    twentyfiveGigE13  13      10000
+Ethernet13      17                    twentyfiveGigE14  14      10000
+Ethernet14      18                    twentyfiveGigE15  15      10000
+Ethernet15      19                    twentyfiveGigE16  16      10000
+Ethernet16       4                    twentyfiveGigE17  17      10000
+Ethernet17       5                    twentyfiveGigE18  18      10000
+Ethernet18       6                    twentyfiveGigE19  19      10000
+Ethernet19       7                    twentyfiveGigE20  20      10000
+Ethernet20       0                    twentyfiveGigE21  21      10000
+Ethernet21       1                    twentyfiveGigE22  22      10000
+Ethernet22       2                    twentyfiveGigE23  23      10000
+Ethernet23       3                    twentyfiveGigE24  24      10000
+Ethernet24      67,68,69,70           twentyfiveGigE25  25     100000
+Ethernet25      71,72,73,74           twentyfiveGigE26  26     100000
+Ethernet26      75,76,77,78           twentyfiveGigE27  27     100000