201911 cel dev

.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,7 +7,9 @@
 #  * 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.
+#  * INSTALL_KUBERNETES: Allows including Kubernetes
 #  * ENABLE_PFCWD_ON_START: Enable PFC Watchdog (PFCWD) on server-facing ports
 #  * by default for TOR switch.
 #  * ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
@@ -162,7 +164,12 @@ 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) \
+                           INSTALL_KUBERNETES=$(INSTALL_KUBERNETES) \
+                           KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
+                           K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
+                           K8s_CNI_CALICO_VERSION=$(K8s_CNI_CALICO_VERSION) \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
                            SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
                            SONIC_INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \
@@ -175,6 +182,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

@@ -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
@@ -201,6 +203,22 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
 
+if [ "$INSTALL_KUBERNETES" == "y" ]
+then
+    ## Install Kubernetes
+    echo '[INFO] Install kubernetes'
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -fsSL \
+        https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
+        sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
+    ## Check out the sources list update matches current Debian version
+    sudo cp files/image_config/kubernetes/kubernetes.list $FILESYSTEM_ROOT/etc/apt/sources.list.d/
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${KUBERNETES_VERSION}-00
+    # kubeadm package auto install kubelet & kubectl
+else
+    echo '[INFO] Skipping Install kubernetes'
+fi
+
 ## Add docker config drop-in to specify dockerd command line
 sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/
 ## Note: $_ means last argument of last command
@@ -272,7 +290,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
@@ -314,10 +333,6 @@ fi
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
 
-## Modifty ntp default configuration: disable initial jump (add -x), and disable
-## jump when time difference is greater than 1000 seconds (remove -g).
-sudo sed -i "s/NTPD_OPTS='-g'/NTPD_OPTS='-x'/" $FILESYSTEM_ROOT/etc/default/ntp
-
 ## Remove sshd host keys, and will regenerate on first sshd start
 sudo rm -f $FILESYSTEM_ROOT/etc/ssh/ssh_host_*_key*
 sudo cp files/sshd/host-ssh-keygen.sh $FILESYSTEM_ROOT/usr/local/bin/
@@ -374,6 +389,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 +408,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 +442,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/accton/x86_64-accton_as7116_54x-r0/sonic_platform/sfp.py

@@ -1111,7 +1111,7 @@ def get_presence(self):
                 presence = int(sfp_presence.read(), 16)
         except IOError:
             return False
-        logger.log_info("debug:port_ %s sfp presence is %s" % (str(self.index)), % (str(presence))
+        logger.log_info("debug:port_ %s sfp presence is %s" % (str(self.index), str(presence)))
         return presence
 
     def get_model(self):

device/alibaba/x86_64-alibaba_as14-128h-cl-r0/AS14-128H/port_config.ini

@@ -0,0 +1,129 @@
+# name		lanes		alias      index
+Ethernet1	9,10	    QSFP1         1
+Ethernet2 	11,12       QSFP2         2
+Ethernet3	15,16       QSFP3         3
+Ethernet4	13,14       QSFP4         4
+Ethernet5	77,78       QSFP5         5
+Ethernet6	79,80       QSFP6         6
+Ethernet7   75,76 	    QSFP7	      7
+Ethernet8   73,74    	QSFP8	      8
+Ethernet9	1,2 	    QSFP9         9
+Ethernet10 	3,4         QSFP10        10
+Ethernet11	7,8         QSFP11        11
+Ethernet12	5,6         QSFP12        12
+Ethernet13	69,70       QSFP13        13
+Ethernet14	71,72       QSFP14        14
+Ethernet15  67,68 	    QSFP15	      15
+Ethernet16  65,66    	QSFP16	      16
+Ethernet17	41,42	    QSFP17        17
+Ethernet18 	43,44       QSFP18        18
+Ethernet19	47,48       QSFP19        19
+Ethernet20	45,46       QSFP20        20
+Ethernet21	109,110     QSFP21        21
+Ethernet22	111,112     QSFP22        22
+Ethernet23  107,108	    QSFP23	      23
+Ethernet24  105,106    	QSFP24	      24
+Ethernet25	33,34	    QSFP25        25
+Ethernet26 	35,36       QSFP26        26
+Ethernet27	39,40       QSFP27        27
+Ethernet28	37,38       QSFP28        28
+Ethernet29	101,102     QSFP29        29
+Ethernet30	103,104     QSFP30        30
+Ethernet31  99,100 	    QSFP31	      31
+Ethernet32  97,98    	QSFP32	      32
+Ethernet33	137,138	    QSFP33        33
+Ethernet34 	139,140     QSFP34        34
+Ethernet35	143,144     QSFP35        35
+Ethernet36	141,142     QSFP36        36
+Ethernet37	205,206     QSFP37        37
+Ethernet38	207,208     QSFP38        38
+Ethernet39  203,204     QSFP39	      39
+Ethernet40  201,202    	QSFP40	      40
+Ethernet41	129,130	    QSFP41        41
+Ethernet42 	131,132     QSFP42        42
+Ethernet43	135,136     QSFP43        43
+Ethernet44	133,134     QSFP44        44
+Ethernet45	197,198     QSFP45        45
+Ethernet46	199,200     QSFP46        46
+Ethernet47  195,196	    QSFP47	      47
+Ethernet48  193,194    	QSFP48	      48
+Ethernet49	169,170	    QSFP49        49
+Ethernet50 	171,172     QSFP50        50
+Ethernet51	175,176     QSFP51        51
+Ethernet52	173,174     QSFP52        52
+Ethernet53	237,238     QSFP53        53
+Ethernet54	239,240     QSFP54        54
+Ethernet55  235,236	    QSFP55	      55
+Ethernet56  233,234    	QSFP56	      56
+Ethernet57	161,162	    QSFP57        57
+Ethernet58 	163,164     QSFP58        58
+Ethernet59	167,168     QSFP59        59
+Ethernet60	165,166     QSFP60        60
+Ethernet61	229,230     QSFP61        61
+Ethernet62	231,232     QSFP62        62
+Ethernet63  227,228 	QSFP63	      63
+Ethernet64  225,226    	QSFP64	      64
+Ethernet65	25,26	    QSFP65        65
+Ethernet66 	27,28       QSFP66        66
+Ethernet67	31,32       QSFP67        67
+Ethernet68	29,30       QSFP68        68
+Ethernet69	93,94       QSFP69        69
+Ethernet70	95,96       QSFP70        70
+Ethernet71  91,92 	    QSFP71	      71
+Ethernet72  89,90    	QSFP72	      72
+Ethernet73	17,18 	    QSFP73        73
+Ethernet74 	19,20       QSFP74        74
+Ethernet75	23,24       QSFP75        75
+Ethernet76	21,22       QSFP76        76
+Ethernet77	85,86       QSFP77        77
+Ethernet78	87,88       QSFP78        78
+Ethernet79  83,84 	    QSFP79	      79
+Ethernet80  81,82    	QSFP80	      80
+Ethernet81	57,58	    QSFP81        81
+Ethernet82 	59,60       QSFP82        82
+Ethernet83	63,64       QSFP83        83
+Ethernet84	61,62       QSFP84        84
+Ethernet85	125,126     QSFP85        85
+Ethernet86	127,128     QSFP86        86
+Ethernet87  123,124	    QSFP87	      87
+Ethernet88  121,122    	QSFP88	      88
+Ethernet89	49,50	    QSFP89        89
+Ethernet90 	51,52       QSFP90        90
+Ethernet91	55,56       QSFP91        91
+Ethernet92	53,54       QSFP92        92
+Ethernet93	117,118     QSFP93        93
+Ethernet94	119,120     QSFP94        94
+Ethernet95  115,116	    QSFP95	      95
+Ethernet96  113,114    	QSFP96	      96
+Ethernet97	153,154	    QSFP97        97
+Ethernet98 	155,156     QSFP98        98
+Ethernet99	159,160     QSFP99        99
+Ethernet100	157,158     QSFP100       100
+Ethernet101	221,222     QSFP101       101
+Ethernet102	223,224     QSFP102       102
+Ethernet103 219,220     QSFP103	      103
+Ethernet104 217,218     QSFP104	      104
+Ethernet105	145,146	    QSFP105       105
+Ethernet106 147,148     QSFP106       106
+Ethernet107	151,152     QSFP107       107
+Ethernet108	149,150     QSFP108       108
+Ethernet109	213,214     QSFP109       109
+Ethernet110	215,216     QSFP110       110
+Ethernet111 211,212	    QSFP111	      111
+Ethernet112 209,210    	QSFP112	      112
+Ethernet113	185,186	    QSFP113       113
+Ethernet114 187,188     QSFP114       114
+Ethernet115	191,192     QSFP115       115
+Ethernet116	189,190     QSFP116       116
+Ethernet117	253,254     QSFP117       117
+Ethernet118	255,256     QSFP118       118
+Ethernet119 251,252	    QSFP119	      119
+Ethernet120 249,250    	QSFP120	      120
+Ethernet121	177,178	    QSFP121       121
+Ethernet122 179,180     QSFP122       122
+Ethernet123	183,184     QSFP123       123
+Ethernet124	181,182     QSFP124       124
+Ethernet125	245,246     QSFP125       125
+Ethernet126	247,248     QSFP126       126
+Ethernet127 243,244 	QSFP127	      127
+Ethernet128 241,242    	QSFP128	      128

device/alibaba/x86_64-alibaba_as14-128h-cl-r0/AS14-128H/sai.profile

@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/platform/th3-as14-128h.config.bcm

device/alibaba/x86_64-alibaba_as14-128h-cl-r0/default_sku

@@ -0,0 +1 @@
+AS23-128H t1

device/alibaba/x86_64-alibaba_as14-128h-cl-r0/installer.conf

@@ -0,0 +1,2 @@
+CONSOLE_SPEED=9600
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="processor.max_cstate=1 intel_idle.max_cstate=0"

device/alibaba/x86_64-alibaba_as14-128h-cl-r0/led_proc_init.soc

@@ -0,0 +1,9 @@
+#Enable all ports
+#port all en=1
+#sleep 6
+#linkscan 250000; port xe,ce linkscan=on
+
+#Load LED
+#led auto on; led start
+
+