[201911] Update the changes from upstream

.gitignore

@@ -23,6 +23,11 @@ target/
 # Subdirectories in src
 src/bash/*
 !src/bash/Makefile
+src/dhcpmon/debian/*
+!src/dhcpmon/debian/changelog 
+!src/dhcpmon/debian/compat 
+!src/dhcpmon/debian/control
+!src/dhcpmon/debian/rules 
 src/ixgbe/*
 !src/ixgbe/Makefile
 src/isc-dhcp/*
@@ -50,6 +55,8 @@ src/isc-dhcp/*
 !src/isc-dhcp/Makefile
 !src/isc-dhcp/patch/
 src/libnl3/*
+!src/libnl3/debian
+src/libnl3/debian/libnl-*/
 !src/libnl3/Makefile
 src/libteam/*
 !src/libteam/Makefile
@@ -104,6 +111,7 @@ src/thrift/*
 # 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
@@ -140,3 +148,17 @@ src/sonic-daemon-base/sonic_daemon_base.egg-info
 # Misc. files
 files/initramfs-tools/arista-convertfs
 files/initramfs-tools/union-mount
+
+# Debian byproduct files
+src/**/debian/stamp-*/
+src/**/debian/*.log
+src/**/debian/*.substvars
+src/**/debian/.debhelper/
+src/**/debian/tmp/
+src/**/debian/autoreconf.*
+src/**/debian/build/
+src/**/debian/files
+src/**/debian/stamp-autotools-files
+
+# .o files
+src/**/*.o

.gitmodules

@@ -75,3 +75,10 @@
 [submodule "Switch-SDK-drivers"]
 	path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
 	url = https://github.com/Mellanox/Switch-SDK-drivers
+[submodule "src/sonic-restapi"]
+	path = src/sonic-restapi
+	url = https://github.com/Azure/sonic-restapi.git
+	branch = master
+[submodule "src/sonic-ztp"]
+	path = src/sonic-ztp
+	url = https://github.com/Azure/sonic-ztp

Makefile.work

@@ -7,6 +7,7 @@
 #  * BUILD_NUMBER: Desired version-number to pass to the building-system.
 #  * ENABLE_DHCP_GRAPH_SERVICE: Enables get-graph service to fetch minigraph files
 #    through http.
+#  * ENABLE_ZTP: Enables zero touch provisioning.
 #  * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
 #  * ENABLE_PFCWD_ON_START: Enable PFC Watchdog (PFCWD) on server-facing ports
 #  * by default for TOR switch.
@@ -162,6 +163,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            BUILD_NUMBER=$(BUILD_NUMBER) \
                            BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \
                            ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
+                           ENABLE_ZTP=$(ENABLE_ZTP) \
                            SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
                            SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
@@ -175,6 +177,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            HTTP_PROXY=$(http_proxy) \
                            HTTPS_PROXY=$(https_proxy) \
                            SONIC_ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY) \
+                           SONIC_ENABLE_RESTAPI=$(ENABLE_RESTAPI) \
                            EXTRA_JESSIE_TARGETS=$(EXTRA_JESSIE_TARGETS) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 

build_debian.sh

@@ -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
@@ -272,7 +274,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     cgroup-tools            \
     ipmitool                \
     ndisc6                  \
-    makedumpfile
+    makedumpfile            \
+    conntrack
 
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
@@ -374,6 +377,12 @@ set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_ignore 2
 
 set /files/etc/sysctl.conf/net.ipv4.neigh.default.base_reachable_time_ms 1800000
 set /files/etc/sysctl.conf/net.ipv6.neigh.default.base_reachable_time_ms 1800000
+set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh1 1024
+set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh1 1024
+set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh2 2048
+set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh2 2048
+set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh3 4096
+set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh3 4096
 
 set /files/etc/sysctl.conf/net.ipv6.conf.default.forwarding 1
 set /files/etc/sysctl.conf/net.ipv6.conf.all.forwarding 1
@@ -387,9 +396,6 @@ set /files/etc/sysctl.conf/net.ipv6.conf.default.keep_addr_on_down 1
 set /files/etc/sysctl.conf/net.ipv6.conf.all.keep_addr_on_down 1
 set /files/etc/sysctl.conf/net.ipv6.conf.eth0.keep_addr_on_down 1
 
-set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra_defrtr 0
-set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra 0
-
 set /files/etc/sysctl.conf/net.ipv4.tcp_l3mdev_accept 1
 set /files/etc/sysctl.conf/net.ipv4.udp_l3mdev_accept 1
 
@@ -424,10 +430,10 @@ EOF
 
 sudo cp files/dhcp/rfc3442-classless-routes $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d
 sudo cp files/dhcp/sethostname $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
+sudo cp files/dhcp/sethostname6 $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
 sudo cp files/dhcp/graphserviceurl $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
 sudo cp files/dhcp/snmpcommunity $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
 sudo cp files/dhcp/vrf $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
-sudo cp files/dhcp/dhclient.conf $FILESYSTEM_ROOT/etc/dhcp/
 if [ -f files/image_config/ntp/ntp ]; then
     sudo cp ./files/image_config/ntp/ntp $FILESYSTEM_ROOT/etc/init.d/
 fi

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/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py

@@ -140,7 +140,7 @@ def install_firmware(self, image_path):
             new_image_path = os.path.join("/tmp", (root.lower() + ext))
             shutil.copy(image_path, new_image_path)
             install_command = "ispvm %s" % new_image_path
-        elif self.name == "BIOS":
-            install_command = "afulnx_64 %s /p /b /n /x /r" % image_path
+        # elif self.name == "BIOS":
+        #     install_command = "afulnx_64 %s /p /b /n /x /r" % image_path
 
         return self.__run_command(install_command)

device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py

@@ -141,7 +141,7 @@ def install_firmware(self, image_path):
             new_image_path = os.path.join("/tmp", (root.lower() + ext))
             shutil.copy(image_path, new_image_path)
             install_command = "ispvm %s" % new_image_path
-        elif self.name == "BIOS":
-            install_command = "afulnx_64 %s /p /b /n /x /r" % image_path
+        # elif self.name == "BIOS":
+        #     install_command = "afulnx_64 %s /p /b /n /x /r" % image_path
 
         return self.__run_command(install_command)

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