Skip to content

Commit 7faf801

Browse files
author
Wirut Getbamrung
authored
Merge branch '201811' into 201811-add-silverstone
2 parents 1d888f2 + 4c80d99 commit 7faf801

File tree

332 files changed

+38531
-2558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

332 files changed

+38531
-2558
lines changed

‎.gitignore

+8
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ target/
1111
*.buildinfo
1212

1313
# Subdirectories in src
14+
src/dhcpmon/debian/*
15+
!src/dhcpmon/debian/changelog
16+
!src/dhcpmon/debian/compat
17+
!src/dhcpmon/debian/control
18+
!src/dhcpmon/debian/rules
1419
src/hiredis/*
1520
!src/hiredis/Makefile
1621
src/igb/*
@@ -27,6 +32,9 @@ src/libteam/*
2732
src/lldpd/*
2833
!src/lldpd/Makefile
2934
!src/lldpd/patch/
35+
src/monit/*
36+
!src/monit/Makefile
37+
!src/monit/patch/
3038
src/mpdecimal/*
3139
!src/mpdecimal/Makefile
3240
src/python-click/*

‎.gitmodules

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
[submodule "quagga"]
2323
path = src/sonic-quagga
2424
url = https://github.com/Azure/sonic-quagga
25-
branch = debian/0.99.24.1
25+
branch = 201811
2626
[submodule "sonic-dbsyncd"]
2727
path = src/sonic-dbsyncd
2828
url = https://github.com/Azure/sonic-dbsyncd
@@ -67,3 +67,6 @@
6767
[submodule "src/redis-dump-load"]
6868
path = src/redis-dump-load
6969
url = https://github.com/p/redis-dump-load.git
70+
[submodule "src/telemetry/sonic-telemetry"]
71+
path = src/telemetry/sonic-telemetry
72+
url = https://github.com/Azure/sonic-telemetry.git

‎build_debian.sh

+10-13
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount proc /proc -t proc
9393

9494
## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
9595
sudo cp files/apt/sources.list $FILESYSTEM_ROOT/etc/apt/
96-
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages}} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
96+
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
9797
sudo LANG=C chroot $FILESYSTEM_ROOT bash -c 'apt-mark auto `apt-mark showmanual`'
9898

9999
## Note: set lang to prevent locale warnings in your chroot
@@ -120,7 +120,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/initramfs-tools_*.deb || \
120120
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
121121
sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-${LINUX_KERNEL_VERSION}-amd64_*.deb || \
122122
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
123-
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl
123+
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl dmidecode hdparm
124124

125125
## Update initramfs for booting with squashfs+overlay
126126
cat files/initramfs-tools/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
@@ -169,13 +169,13 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apt-transport-https \
169169
curl \
170170
gnupg2 \
171171
software-properties-common
172-
sudo LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/docker.gpg -fsSL https://download.docker.com/linux/debian/gpg
172+
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/docker.gpg -fsSL https://download.docker.com/linux/debian/gpg
173173
sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add /tmp/docker.gpg
174174
sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
175175
sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
176176
"deb [arch=amd64] https://download.docker.com/linux/debian stretch stable"
177177
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
178-
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
178+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
179179
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
180180

181181
## Add docker config drop-in to select aufs, otherwise it may select other storage driver
@@ -215,7 +215,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
215215
openssh-server \
216216
python \
217217
python-setuptools \
218-
monit \
219218
python-apt \
220219
traceroute \
221220
iputils-ping \
@@ -274,10 +273,6 @@ sudo mv $FILESYSTEM_ROOT/grub-pc-bin*.deb $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-
274273
## Disable kexec supported reboot which was installed by default
275274
sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
276275

277-
## Modifty ntp default configuration: disable initial jump (add -x), and disable
278-
## jump when time difference is greater than 1000 seconds (remove -g).
279-
sudo sed -i "s/NTPD_OPTS='-g'/NTPD_OPTS='-x'/" $FILESYSTEM_ROOT/etc/default/ntp
280-
281276
## Fix ping tools permission so non root user can directly use them
282277
## Note: this is a workaround since aufs doesn't support extended attributes
283278
## Ref: https://github.com/moby/moby/issues/5650#issuecomment-303499489
@@ -313,10 +308,6 @@ EOF
313308
sudo sed -i 's/^ListenAddress ::/#ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
314309
sudo sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
315310

316-
## Config monit
317-
sudo cp files/image_config/monit/monitrc $FILESYSTEM_ROOT/etc/monit/
318-
sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc
319-
320311
## Config sysctl
321312
sudo mkdir -p $FILESYSTEM_ROOT/var/core
322313
sudo augtool --autosave "
@@ -344,6 +335,12 @@ set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_ignore 2
344335
345336
set /files/etc/sysctl.conf/net.ipv4.neigh.default.base_reachable_time_ms 1800000
346337
set /files/etc/sysctl.conf/net.ipv6.neigh.default.base_reachable_time_ms 1800000
338+
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh1 1024
339+
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh1 1024
340+
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh2 2048
341+
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh2 2048
342+
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh3 4096
343+
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh3 4096
347344
348345
set /files/etc/sysctl.conf/net.ipv6.conf.default.forwarding 1
349346
set /files/etc/sysctl.conf/net.ipv6.conf.all.forwarding 1

‎device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arista-7050-QX-32S

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# PG lossless profiles.
22
# speed cable size xon xoff threshold xon_offset
3-
10000 5m 1248 2288 35776 -3 2288
4-
25000 5m 1248 2288 53248 -3 2288
5-
40000 5m 1248 2288 66560 -3 2288
6-
50000 5m 1248 2288 90272 -3 2288
7-
100000 5m 1248 2288 165568 -3 2288
8-
10000 40m 1248 2288 37024 -3 2288
9-
25000 40m 1248 2288 53248 -3 2288
10-
40000 40m 1248 2288 71552 -3 2288
11-
50000 40m 1248 2288 96096 -3 2288
12-
100000 40m 1248 2288 177632 -3 2288
13-
10000 300m 1248 2288 46176 -3 2288
14-
25000 300m 1248 2288 79040 -3 2288
15-
40000 300m 1248 2288 108160 -3 2288
16-
50000 300m 1248 2288 141856 -3 2288
17-
100000 300m 1248 2288 268736 -3 2288
3+
10000 5m 1248 2288 35776 0 2288
4+
25000 5m 1248 2288 53248 0 2288
5+
40000 5m 1248 2288 66560 0 2288
6+
50000 5m 1248 2288 90272 0 2288
7+
100000 5m 1248 2288 165568 0 2288
8+
10000 40m 1248 2288 37024 0 2288
9+
25000 40m 1248 2288 53248 0 2288
10+
40000 40m 1248 2288 71552 0 2288
11+
50000 40m 1248 2288 96096 0 2288
12+
100000 40m 1248 2288 177632 0 2288
13+
10000 300m 1248 2288 46176 0 2288
14+
25000 300m 1248 2288 79040 0 2288
15+
40000 300m 1248 2288 108160 0 2288
16+
50000 300m 1248 2288 141856 0 2288
17+
100000 300m 1248 2288 268736 0 2288

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2

+20
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "2097152",
9+
"green_min_threshold" : "250000",
10+
"yellow_max_threshold" : "2097152",
11+
"yellow_min_threshold" : "1048576",
12+
"red_max_threshold" : "2097152",
13+
"red_min_threshold" : "1048576",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# PG lossless profiles.
22
# speed cable size xon xoff threshold xon_offset
3-
10000 5m 1248 2288 35776 -3 2288
4-
25000 5m 1248 2288 53248 -3 2288
5-
40000 5m 1248 2288 66560 -3 2288
6-
50000 5m 1248 2288 79872 -3 2288
7-
100000 5m 1248 2288 165568 -3 2288
8-
10000 40m 1248 2288 37024 -3 2288
9-
25000 40m 1248 2288 56160 -3 2288
10-
40000 40m 1248 2288 71552 -3 2288
11-
50000 40m 1248 2288 85696 -3 2288
12-
100000 40m 1248 2288 177632 -3 2288
13-
10000 300m 1248 2288 46176 -3 2288
14-
25000 300m 1248 2288 79040 -3 2288
15-
40000 300m 1248 2288 108160 -3 2288
16-
50000 300m 1248 2288 141856 -3 2288
17-
100000 300m 1248 2288 268736 -3 2288
3+
10000 5m 1248 2288 35776 0 2288
4+
25000 5m 1248 2288 53248 0 2288
5+
40000 5m 1248 2288 66560 0 2288
6+
50000 5m 1248 2288 79872 0 2288
7+
100000 5m 1248 2288 165568 0 2288
8+
10000 40m 1248 2288 37024 0 2288
9+
25000 40m 1248 2288 56160 0 2288
10+
40000 40m 1248 2288 71552 0 2288
11+
50000 40m 1248 2288 85696 0 2288
12+
100000 40m 1248 2288 177632 0 2288
13+
10000 300m 1248 2288 46176 0 2288
14+
25000 300m 1248 2288 79040 0 2288
15+
40000 300m 1248 2288 108160 0 2288
16+
50000 300m 1248 2288 141856 0 2288
17+
100000 300m 1248 2288 268736 0 2288

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2

+20
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "2097152",
9+
"green_min_threshold" : "250000",
10+
"yellow_max_threshold" : "2097152",
11+
"yellow_min_threshold" : "1048576",
12+
"red_max_threshold" : "2097152",
13+
"red_min_threshold" : "1048576",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# PG lossless profiles.
22
# speed cable size xon xoff threshold xon_offset
3-
10000 5m 1248 2288 35776 -3 2288
4-
25000 5m 1248 2288 53248 -3 2288
5-
40000 5m 1248 2288 66560 -3 2288
6-
50000 5m 1248 2288 90272 -3 2288
7-
100000 5m 1248 2288 165568 -3 2288
8-
10000 40m 1248 2288 37024 -3 2288
9-
25000 40m 1248 2288 53248 -3 2288
10-
40000 40m 1248 2288 71552 -3 2288
11-
50000 40m 1248 2288 96096 -3 2288
12-
100000 40m 1248 2288 177632 -3 2288
13-
10000 300m 1248 2288 46176 -3 2288
14-
25000 300m 1248 2288 79040 -3 2288
15-
40000 300m 1248 2288 108160 -3 2288
16-
50000 300m 1248 2288 141856 -3 2288
17-
100000 300m 1248 2288 268736 -3 2288
3+
10000 5m 1248 2288 35776 0 2288
4+
25000 5m 1248 2288 53248 0 2288
5+
40000 5m 1248 2288 66560 0 2288
6+
50000 5m 1248 2288 90272 0 2288
7+
100000 5m 1248 2288 165568 0 2288
8+
10000 40m 1248 2288 37024 0 2288
9+
25000 40m 1248 2288 53248 0 2288
10+
40000 40m 1248 2288 71552 0 2288
11+
50000 40m 1248 2288 96096 0 2288
12+
100000 40m 1248 2288 177632 0 2288
13+
10000 300m 1248 2288 46176 0 2288
14+
25000 300m 1248 2288 79040 0 2288
15+
40000 300m 1248 2288 108160 0 2288
16+
50000 300m 1248 2288 141856 0 2288
17+
100000 300m 1248 2288 268736 0 2288

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2

+20
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "2097152",
9+
"green_min_threshold" : "250000",
10+
"yellow_max_threshold" : "2097152",
11+
"yellow_min_threshold" : "1048576",
12+
"red_max_threshold" : "2097152",
13+
"red_min_threshold" : "1048576",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}

‎device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/pg_profile_lookup.ini

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# PG lossless profiles.
22
# speed cable size xon xoff threshold xon_offset
3-
10000 5m 1248 2288 35776 -3 2288
4-
25000 5m 1248 2288 53248 -3 2288
5-
40000 5m 1248 2288 66560 -3 2288
6-
50000 5m 1248 2288 90272 -3 2288
7-
100000 5m 1248 2288 165568 -3 2288
8-
10000 40m 1248 2288 37024 -3 2288
9-
25000 40m 1248 2288 53248 -3 2288
10-
40000 40m 1248 2288 71552 -3 2288
11-
50000 40m 1248 2288 96096 -3 2288
12-
100000 40m 1248 2288 177632 -3 2288
13-
10000 300m 1248 2288 46176 -3 2288
14-
25000 300m 1248 2288 79040 -3 2288
15-
40000 300m 1248 2288 108160 -3 2288
16-
50000 300m 1248 2288 141856 -3 2288
17-
100000 300m 1248 2288 268736 -3 2288
3+
10000 5m 1248 2288 35776 0 2288
4+
25000 5m 1248 2288 53248 0 2288
5+
40000 5m 1248 2288 66560 0 2288
6+
50000 5m 1248 2288 90272 0 2288
7+
100000 5m 1248 2288 165568 0 2288
8+
10000 40m 1248 2288 37024 0 2288
9+
25000 40m 1248 2288 53248 0 2288
10+
40000 40m 1248 2288 71552 0 2288
11+
50000 40m 1248 2288 96096 0 2288
12+
100000 40m 1248 2288 177632 0 2288
13+
10000 300m 1248 2288 46176 0 2288
14+
25000 300m 1248 2288 79040 0 2288
15+
40000 300m 1248 2288 108160 0 2288
16+
50000 300m 1248 2288 141856 0 2288
17+
100000 300m 1248 2288 268736 0 2288

‎device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/qos.json.j2

+20
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "2097152",
9+
"green_min_threshold" : "250000",
10+
"yellow_max_threshold" : "2097152",
11+
"yellow_min_threshold" : "1048576",
12+
"red_max_threshold" : "2097152",
13+
"red_min_threshold" : "1048576",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}

‎device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/pg_profile_lookup.ini

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# PG lossless profiles.
22
# speed cable size xon xoff threshold xon_offset
3-
10000 5m 1248 2288 35776 -3 2288
4-
25000 5m 1248 2288 53248 -3 2288
5-
40000 5m 1248 2288 66560 -3 2288
6-
50000 5m 1248 2288 90272 -3 2288
7-
100000 5m 1248 2288 165568 -3 2288
8-
10000 40m 1248 2288 37024 -3 2288
9-
25000 40m 1248 2288 53248 -3 2288
10-
40000 40m 1248 2288 71552 -3 2288
11-
50000 40m 1248 2288 96096 -3 2288
12-
100000 40m 1248 2288 177632 -3 2288
13-
10000 300m 1248 2288 46176 -3 2288
14-
25000 300m 1248 2288 79040 -3 2288
15-
40000 300m 1248 2288 108160 -3 2288
16-
50000 300m 1248 2288 141856 -3 2288
17-
100000 300m 1248 2288 268736 -3 2288
3+
10000 5m 1248 2288 35776 0 2288
4+
25000 5m 1248 2288 53248 0 2288
5+
40000 5m 1248 2288 66560 0 2288
6+
50000 5m 1248 2288 90272 0 2288
7+
100000 5m 1248 2288 165568 0 2288
8+
10000 40m 1248 2288 37024 0 2288
9+
25000 40m 1248 2288 53248 0 2288
10+
40000 40m 1248 2288 71552 0 2288
11+
50000 40m 1248 2288 96096 0 2288
12+
100000 40m 1248 2288 177632 0 2288
13+
10000 300m 1248 2288 46176 0 2288
14+
25000 300m 1248 2288 79040 0 2288
15+
40000 300m 1248 2288 108160 0 2288
16+
50000 300m 1248 2288 141856 0 2288
17+
100000 300m 1248 2288 268736 0 2288

‎device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/qos.json.j2

+20
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "2097152",
9+
"green_min_threshold" : "250000",
10+
"yellow_max_threshold" : "2097152",
11+
"yellow_min_threshold" : "1048576",
12+
"red_max_threshold" : "2097152",
13+
"red_min_threshold" : "1048576",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}

0 commit comments

Comments
 (0)