Mgmt vrf buster

.gitignore

@@ -109,30 +109,9 @@ src/thrift/*
 !src/thrift/Makefile
 
 # Autogenerated Dockerfiles
-sonic-slave/Dockerfile
-sonic-slave-stretch/Dockerfile
-sonic-slave-jessie/Dockerfile
-dockers/docker-base/Dockerfile
-dockers/docker-base-stretch/Dockerfile
-dockers/docker-config-engine/Dockerfile
-dockers/docker-config-engine-stretch/Dockerfile
-dockers/docker-database/Dockerfile
-dockers/docker-dhcp-relay/Dockerfile
-dockers/docker-fpm-frr/Dockerfile
-dockers/docker-fpm-gobgp/Dockerfile
-dockers/docker-fpm-quagga/Dockerfile
-dockers/docker-lldp-sv2/Dockerfile
-dockers/docker-orchagent/Dockerfile
-dockers/docker-platform-monitor/Dockerfile
-dockers/docker-router-advertiser/Dockerfile
-dockers/docker-snmp-sv2/Dockerfile
-dockers/docker-teamd/Dockerfile
-dockers/docker-sonic-mgmt/Dockerfile
-dockers/docker-sonic-telemetry/Dockerfile
-platform/*/docker-saiserver-*/Dockerfile
-platform/*/docker-syncd-*/Dockerfile
-platform/*/docker-syncd-*-rpc/Dockerfile
-platform/vs/docker-sonic-vs/Dockerfile
+sonic-slave*/Dockerfile
+dockers/*/Dockerfile
+platform/*/docker-*/Dockerfile
 
 # Installer-related files and directories
 installer/x86_64/platforms/

README.md

@@ -8,6 +8,7 @@ P4: [![P4](https://sonic-jenkins.westus2.cloudapp.azure.com/job/p4/job/buildimag
 VS: [![VS](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-all/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-all)
 
 *201911*:
+Innovium: [![Innovium](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-201911/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-201911/)
 Broadcom: [![Broadcom](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-201911/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-201911/)
 Mellanox: [![Mellanox](https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-201911/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-201911/)
 VS: [![VS](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-201911/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-201911)

build_debian.sh

@@ -37,7 +37,7 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
 else
     DOCKER_VERSION=5:18.09.8~3-0~debian-stretch
 fi
-LINUX_KERNEL_VERSION=4.9.0-9-2
+LINUX_KERNEL_VERSION=4.9.0-11-2
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@@ -139,7 +139,9 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/initramfs-tools_*.deb || \
 sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/linux-image-${LINUX_KERNEL_VERSION}-*_${CONFIGURED_ARCH}.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl
-[[ $CONFIGURED_ARCH == amd64 ]] && sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode
+if [[ $CONFIGURED_ARCH == amd64 ]]; then
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode hdparm
+fi
 
 ## Update initramfs for booting with squashfs+overlay
 cat files/initramfs-tools/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null

build_debug_docker_j2.sh

@@ -28,7 +28,7 @@ debs/{{ deb }}{{' '}}
 {% if $3 is defined %}
 {% if $3|length %}
 
-RUN apt-get install -f -y \
+RUN apt-get update && apt-get install -f -y \
 {% for dbg in $3.split(' ') -%}
 {{ dbg }}{{' '}}
 {%- endfor %}

device/arista/x86_64-arista_7050cx3_32s/fancontrol

@@ -0,0 +1,10 @@
+INTERVAL=5
+DEVPATH=hwmon4=devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-11/11-004c hwmon3=devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-2/2-0060
+DEVNAME=hwmon4=max6658 hwmon3=crow_cpld
+FCTEMPS=hwmon3/pwm4=hwmon4/temp1_input hwmon3/pwm3=hwmon4/temp1_input hwmon3/pwm2=hwmon4/temp1_input hwmon3/pwm1=hwmon4/temp1_input
+FCFANS=hwmon3/pwm4=hwmon3/fan4_input hwmon3/pwm3=hwmon3/fan3_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm1=hwmon3/fan1_input
+MINTEMP=hwmon3/pwm4=40 hwmon3/pwm3=40 hwmon3/pwm2=40 hwmon3/pwm1=40
+MINPWM=hwmon3/pwm4=179 hwmon3/pwm3=179 hwmon3/pwm2=179 hwmon3/pwm1=179
+MAXTEMP=hwmon3/pwm4=50 hwmon3/pwm3=50 hwmon3/pwm2=50 hwmon3/pwm1=50
+MINSTART=hwmon3/pwm4=179 hwmon3/pwm3=179 hwmon3/pwm2=179 hwmon3/pwm1=179
+MINSTOP=hwmon3/pwm4=179 hwmon3/pwm3=179 hwmon3/pwm2=179 hwmon3/pwm1=179

device/arista/x86_64-arista_7050cx3_32s/sensors.conf

@@ -21,8 +21,8 @@ chip "max6658-i2c-2-4c"
 
 chip "max6658-i2c-11-4c"
     label temp1 "Board temp sensor"
-    set temp1_max 55
-    set temp1_crit 70
+    set temp1_max 75
+    set temp1_crit 85
 
     label temp2 "Front panel temp sensor"
     set temp2_max 60

device/cig/x86_64-cig_cs5435_54p-r0/Cig-CS5435-54P/buffers.json.j2

@@ -0,0 +1,111 @@
+{# Default values which will be used if no actual configura available #}
+{% set default_cable = '40m' %}
+{% set default_speed = '10G' %}
+{% set default_ports_num = 54 -%}
+
+{# Port configuration to cable length look-up table #}
+{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
+{# Roles described in the minigraph #}
+{% set ports2cable = {
+        'torrouter_server'       : '5m',
+        'leafrouter_torrouter'   : '40m',
+        'spinerouter_leafrouter' : '300m'
+        }
+%}
+
+{%- macro cable_length(port_name) -%}
+    {%- set cable_len = [] -%}
+    {%- for local_port in DEVICE_NEIGHBOR -%}
+        {%- if local_port == port_name -%}
+            {%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
+                {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
+                {%- set neighbor_role = neighbor.type -%}
+                {%- set roles1 = switch_role + '_' + neighbor_role %}
+                {%- set roles2 = neighbor_role + '_' + switch_role -%}
+                {%- set roles1 = roles1 | lower -%}
+                {%- set roles2 = roles2 | lower -%}
+                {%- if roles1 in ports2cable -%}
+                    {%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
+                {%- elif roles2 in ports2cable -%}
+                    {%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
+                {%- endif -%}
+            {%- endif -%}
+        {%- endif -%}
+    {%- endfor -%}
+    {%- if cable_len -%}
+        {{ cable_len.0 }}
+    {%- else -%}
+        {{ default_cable }}
+    {%- endif -%}
+{% endmacro %}
+
+{%- if DEVICE_METADATA is defined %}
+{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
+{%- endif -%}
+
+{# Generate list of ports if not defined #}
+{% if PORT is not defined %}
+    {% set PORT = [] %}
+    {% for port_idx in range(0,default_ports_num) %}
+        {% if PORT.append("Ethernet%d" % (port_idx)) %}{% endif %}
+    {% endfor %}
+{% endif -%}
+
+{% set port_names_list = [] %}
+{% for port in PORT %}
+    {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            {% for port in PORT %}
+                {% set cable = cable_length(port) -%}
+                "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
+
+            {% endfor %}
+        }
+    },
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "20971328",
+            "type": "ingress",
+            "mode": "static"
+        },
+        "ingress_lossy_pool": {
+            "size": "20971328",
+            "type": "ingress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "20971328",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "xon":"78400",
+            "xoff":"132160",
+            "size":"3584",
+            "static_th":"82880"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "size":"3584",
+            "dynamic_th":"-1"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"3584",
+            "dynamic_th":"-4"
+        }
+    },
+    "BUFFER_PG": {
+    },
+    "BUFFER_QUEUE": {
+    }
+}
+

device/cig/x86_64-cig_cs5435_54p-r0/Cig-CS5435-54P/pg_profile_lookup.ini

@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable  size    xon    xoff    threshold
+  10000  5m    3584    32256  59136   36736
+  25000  5m    3584    41216  68096   45696
+  40000  5m    3584    47488  74368   51968
+  50000  5m    3584    52864  79744   57344
+ 100000  5m    3584    78400  132160  82880
+  10000  40m   3584    32256  59136   36736
+  25000  40m   3584    41216  68096   45696
+  40000  40m   3584    47488  74368   51968
+  50000  40m   3584    52864  79744   57344
+ 100000  40m   3584    78400  132160  82880
+  10000  300m  3584    32256  65856   36736
+  25000  300m  3584    41216  84672   45696
+  40000  300m  3584    47488  101024  51968
+  50000  300m  3584    52864  113120  57344
+ 100000  300m  3584    78400  198688  82880

device/cig/x86_64-cig_cs5435_54p-r0/Cig-CS5435-54P/port_config.ini

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