Skip to content

Commit e63070a

Browse files
bbinxiebbinxie
authored
Merge pull request sonic-net#156 from Azure/201811
update from azure 201811
2 parents 841385d + e2ae4ff commit e63070a

File tree

290 files changed

+34995
-2150
lines changed

Some content is hidden

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

290 files changed

+34995
-2150
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

+3
Original file line numberDiff line numberDiff line change
@@ -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

+16-12
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,7 +169,7 @@ 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 \
@@ -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 \
@@ -248,6 +247,13 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
248247
ndisc6 \
249248
ipmitool
250249

250+
## Set /etc/shadow permissions to -rw-------.
251+
sudo LANG=c chroot $FILESYSTEM_ROOT chmod 600 /etc/shadow
252+
253+
## Set /etc/passwd, /etc/group permissions to -rw-r--r--.
254+
sudo LANG=c chroot $FILESYSTEM_ROOT chmod 644 /etc/passwd
255+
sudo LANG=c chroot $FILESYSTEM_ROOT chmod 644 /etc/group
256+
251257
#Adds a locale to a debian system in non-interactive mode
252258
sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
253259
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT locale-gen "en_US.UTF-8"
@@ -267,10 +273,6 @@ sudo mv $FILESYSTEM_ROOT/grub-pc-bin*.deb $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-
267273
## Disable kexec supported reboot which was installed by default
268274
sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
269275

270-
## Modifty ntp default configuration: disable initial jump (add -x), and disable
271-
## jump when time difference is greater than 1000 seconds (remove -g).
272-
sudo sed -i "s/NTPD_OPTS='-g'/NTPD_OPTS='-x'/" $FILESYSTEM_ROOT/etc/default/ntp
273-
274276
## Fix ping tools permission so non root user can directly use them
275277
## Note: this is a workaround since aufs doesn't support extended attributes
276278
## Ref: https://github.com/moby/moby/issues/5650#issuecomment-303499489
@@ -306,10 +308,6 @@ EOF
306308
sudo sed -i 's/^ListenAddress ::/#ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
307309
sudo sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
308310

309-
## Config monit
310-
sudo cp files/image_config/monit/monitrc $FILESYSTEM_ROOT/etc/monit/
311-
sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc
312-
313311
## Config sysctl
314312
sudo mkdir -p $FILESYSTEM_ROOT/var/core
315313
sudo augtool --autosave "
@@ -337,6 +335,12 @@ set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_ignore 2
337335
338336
set /files/etc/sysctl.conf/net.ipv4.neigh.default.base_reachable_time_ms 1800000
339337
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
340344
341345
set /files/etc/sysctl.conf/net.ipv6.conf.default.forwarding 1
342346
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/celestica/x86_64-cel_seastone-r0/Seastone-DX010-25-50/port_config.ini

+112-112
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,113 @@
11
# name lanes alias index speed
2-
Ethernet0 65 Eth1/1 0 25000
3-
Ethernet1 66 Eth1/2 0 25000
4-
Ethernet2 67 Eth1/3 0 25000
5-
Ethernet3 68 Eth1/4 0 25000
6-
Ethernet4 69 Eth2/1 1 25000
7-
Ethernet5 70 Eth2/2 1 25000
8-
Ethernet6 71 Eth2/3 1 25000
9-
Ethernet7 72 Eth2/4 1 25000
10-
Ethernet8 73 Eth3/1 2 25000
11-
Ethernet9 74 Eth3/2 2 25000
12-
Ethernet10 75 Eth3/3 2 25000
13-
Ethernet11 76 Eth3/4 2 25000
14-
Ethernet12 77 Eth4/1 3 25000
15-
Ethernet13 78 Eth4/2 3 25000
16-
Ethernet14 79 Eth4/3 3 25000
17-
Ethernet15 80 Eth4/4 3 25000
18-
Ethernet16 33 Eth5/1 4 25000
19-
Ethernet17 34 Eth5/2 4 25000
20-
Ethernet18 35 Eth5/3 4 25000
21-
Ethernet19 36 Eth5/4 4 25000
22-
Ethernet20 37 Eth6/1 5 25000
23-
Ethernet21 38 Eth6/2 5 25000
24-
Ethernet22 39 Eth6/3 5 25000
25-
Ethernet23 40 Eth6/4 5 25000
26-
Ethernet24 41 Eth7/1 6 25000
27-
Ethernet25 42 Eth7/2 6 25000
28-
Ethernet26 43 Eth7/3 6 25000
29-
Ethernet27 44 Eth7/4 6 25000
30-
Ethernet28 45 Eth8/1 7 25000
31-
Ethernet29 46 Eth8/2 7 25000
32-
Ethernet30 47 Eth8/3 7 25000
33-
Ethernet31 48 Eth8/4 7 25000
34-
Ethernet32 49 Eth9/1 8 25000
35-
Ethernet33 50 Eth9/2 8 25000
36-
Ethernet34 51 Eth9/3 8 25000
37-
Ethernet35 52 Eth9/4 8 25000
38-
Ethernet36 53 Eth10/1 9 25000
39-
Ethernet37 54 Eth10/2 9 25000
40-
Ethernet38 55 Eth10/3 9 25000
41-
Ethernet39 56 Eth10/4 9 25000
42-
Ethernet40 57 Eth11/1 10 25000
43-
Ethernet41 58 Eth11/2 10 25000
44-
Ethernet42 59 Eth11/3 10 25000
45-
Ethernet43 60 Eth11/4 10 25000
46-
Ethernet44 61 Eth12/1 11 25000
47-
Ethernet45 62 Eth12/2 11 25000
48-
Ethernet46 63 Eth12/3 11 25000
49-
Ethernet47 64 Eth12/4 11 25000
50-
Ethernet48 81 Eth13/1 12 25000
51-
Ethernet49 82 Eth13/2 12 25000
52-
Ethernet50 83 Eth13/3 12 25000
53-
Ethernet51 84 Eth13/4 12 25000
54-
Ethernet52 85 Eth14/1 13 25000
55-
Ethernet53 86 Eth14/2 13 25000
56-
Ethernet54 87 Eth14/3 13 25000
57-
Ethernet55 88 Eth14/4 13 25000
58-
Ethernet56 89 Eth15/1 14 25000
59-
Ethernet57 90 Eth15/2 14 25000
60-
Ethernet58 91 Eth15/3 14 25000
61-
Ethernet59 92 Eth15/4 14 25000
62-
Ethernet60 93 Eth16/1 15 25000
63-
Ethernet61 94 Eth16/2 15 25000
64-
Ethernet62 95 Eth16/3 15 25000
65-
Ethernet63 96 Eth16/4 15 25000
66-
Ethernet64 97 Eth17/1 16 25000
67-
Ethernet65 98 Eth17/2 16 25000
68-
Ethernet66 99 Eth17/3 16 25000
69-
Ethernet67 100 Eth17/4 16 25000
70-
Ethernet68 101 Eth18/1 17 25000
71-
Ethernet69 102 Eth18/2 17 25000
72-
Ethernet70 103 Eth18/3 17 25000
73-
Ethernet71 104 Eth18/4 17 25000
74-
Ethernet72 105 Eth19/1 18 25000
75-
Ethernet73 106 Eth19/2 18 25000
76-
Ethernet74 107 Eth19/3 18 25000
77-
Ethernet75 108 Eth19/4 18 25000
78-
Ethernet76 109 Eth20/1 19 25000
79-
Ethernet77 110 Eth20/2 19 25000
80-
Ethernet78 111 Eth20/3 19 25000
81-
Ethernet79 112 Eth20/4 19 25000
82-
Ethernet80 1 Eth21/1 20 25000
83-
Ethernet81 2 Eth21/2 20 25000
84-
Ethernet82 3 Eth21/3 20 25000
85-
Ethernet83 4 Eth21/4 20 25000
86-
Ethernet84 5 Eth22/1 21 25000
87-
Ethernet85 6 Eth22/2 21 25000
88-
Ethernet86 7 Eth22/3 21 25000
89-
Ethernet87 8 Eth22/4 21 25000
90-
Ethernet88 9 Eth23/1 22 25000
91-
Ethernet89 10 Eth23/2 22 25000
92-
Ethernet90 11 Eth23/3 22 25000
93-
Ethernet91 12 Eth23/4 22 25000
94-
Ethernet92 13 Eth24/1 23 25000
95-
Ethernet93 14 Eth24/2 23 25000
96-
Ethernet94 15 Eth24/3 23 25000
97-
Ethernet95 16 Eth24/4 23 25000
98-
Ethernet96 17,18 Eth25/1 24 50000
99-
Ethernet98 19,20 Eth25/2 24 50000
100-
Ethernet100 21,22 Eth26/1 25 50000
101-
Ethernet102 23,24 Eth26/2 25 50000
102-
Ethernet104 25,26 Eth27/1 26 50000
103-
Ethernet106 27,28 Eth27/2 26 50000
104-
Ethernet108 29,30 Eth28/1 27 50000
105-
Ethernet110 31,32 Eth28/2 27 50000
106-
Ethernet112 113,114 Eth29/1 28 50000
107-
Ethernet114 115,116 Eth29/2 28 50000
108-
Ethernet116 117,118 Eth30/1 29 50000
109-
Ethernet118 119,120 Eth30/2 29 50000
110-
Ethernet120 121,122 Eth31/1 30 50000
111-
Ethernet122 123,124 Eth31/2 30 50000
112-
Ethernet124 125,126 Eth32/1 31 50000
113-
Ethernet126 127,128 Eth32/2 31 50000
2+
Ethernet0 65 Eth1/1 1 25000
3+
Ethernet1 66 Eth1/2 1 25000
4+
Ethernet2 67 Eth1/3 1 25000
5+
Ethernet3 68 Eth1/4 1 25000
6+
Ethernet4 69 Eth2/1 2 25000
7+
Ethernet5 70 Eth2/2 2 25000
8+
Ethernet6 71 Eth2/3 2 25000
9+
Ethernet7 72 Eth2/4 2 25000
10+
Ethernet8 73 Eth3/1 3 25000
11+
Ethernet9 74 Eth3/2 3 25000
12+
Ethernet10 75 Eth3/3 3 25000
13+
Ethernet11 76 Eth3/4 3 25000
14+
Ethernet12 77 Eth4/1 4 25000
15+
Ethernet13 78 Eth4/2 4 25000
16+
Ethernet14 79 Eth4/3 4 25000
17+
Ethernet15 80 Eth4/4 4 25000
18+
Ethernet16 33 Eth5/1 5 25000
19+
Ethernet17 34 Eth5/2 5 25000
20+
Ethernet18 35 Eth5/3 5 25000
21+
Ethernet19 36 Eth5/4 5 25000
22+
Ethernet20 37 Eth6/1 6 25000
23+
Ethernet21 38 Eth6/2 6 25000
24+
Ethernet22 39 Eth6/3 6 25000
25+
Ethernet23 40 Eth6/4 6 25000
26+
Ethernet24 41 Eth7/1 7 25000
27+
Ethernet25 42 Eth7/2 7 25000
28+
Ethernet26 43 Eth7/3 7 25000
29+
Ethernet27 44 Eth7/4 7 25000
30+
Ethernet28 45 Eth8/1 8 25000
31+
Ethernet29 46 Eth8/2 8 25000
32+
Ethernet30 47 Eth8/3 8 25000
33+
Ethernet31 48 Eth8/4 8 25000
34+
Ethernet32 49 Eth9/1 9 25000
35+
Ethernet33 50 Eth9/2 9 25000
36+
Ethernet34 51 Eth9/3 9 25000
37+
Ethernet35 52 Eth9/4 9 25000
38+
Ethernet36 53 Eth10/1 10 25000
39+
Ethernet37 54 Eth10/2 10 25000
40+
Ethernet38 55 Eth10/3 10 25000
41+
Ethernet39 56 Eth10/4 10 25000
42+
Ethernet40 57 Eth11/1 11 25000
43+
Ethernet41 58 Eth11/2 11 25000
44+
Ethernet42 59 Eth11/3 11 25000
45+
Ethernet43 60 Eth11/4 11 25000
46+
Ethernet44 61 Eth12/1 12 25000
47+
Ethernet45 62 Eth12/2 12 25000
48+
Ethernet46 63 Eth12/3 12 25000
49+
Ethernet47 64 Eth12/4 12 25000
50+
Ethernet48 81 Eth13/1 13 25000
51+
Ethernet49 82 Eth13/2 13 25000
52+
Ethernet50 83 Eth13/3 13 25000
53+
Ethernet51 84 Eth13/4 13 25000
54+
Ethernet52 85 Eth14/1 14 25000
55+
Ethernet53 86 Eth14/2 14 25000
56+
Ethernet54 87 Eth14/3 14 25000
57+
Ethernet55 88 Eth14/4 14 25000
58+
Ethernet56 89 Eth15/1 15 25000
59+
Ethernet57 90 Eth15/2 15 25000
60+
Ethernet58 91 Eth15/3 15 25000
61+
Ethernet59 92 Eth15/4 15 25000
62+
Ethernet60 93 Eth16/1 16 25000
63+
Ethernet61 94 Eth16/2 16 25000
64+
Ethernet62 95 Eth16/3 16 25000
65+
Ethernet63 96 Eth16/4 16 25000
66+
Ethernet64 97 Eth17/1 17 25000
67+
Ethernet65 98 Eth17/2 17 25000
68+
Ethernet66 99 Eth17/3 17 25000
69+
Ethernet67 100 Eth17/4 17 25000
70+
Ethernet68 101 Eth18/1 18 25000
71+
Ethernet69 102 Eth18/2 18 25000
72+
Ethernet70 103 Eth18/3 18 25000
73+
Ethernet71 104 Eth18/4 18 25000
74+
Ethernet72 105 Eth19/1 19 25000
75+
Ethernet73 106 Eth19/2 19 25000
76+
Ethernet74 107 Eth19/3 19 25000
77+
Ethernet75 108 Eth19/4 19 25000
78+
Ethernet76 109 Eth20/1 20 25000
79+
Ethernet77 110 Eth20/2 20 25000
80+
Ethernet78 111 Eth20/3 20 25000
81+
Ethernet79 112 Eth20/4 20 25000
82+
Ethernet80 1 Eth21/1 21 25000
83+
Ethernet81 2 Eth21/2 21 25000
84+
Ethernet82 3 Eth21/3 21 25000
85+
Ethernet83 4 Eth21/4 21 25000
86+
Ethernet84 5 Eth22/1 22 25000
87+
Ethernet85 6 Eth22/2 22 25000
88+
Ethernet86 7 Eth22/3 22 25000
89+
Ethernet87 8 Eth22/4 22 25000
90+
Ethernet88 9 Eth23/1 23 25000
91+
Ethernet89 10 Eth23/2 23 25000
92+
Ethernet90 11 Eth23/3 23 25000
93+
Ethernet91 12 Eth23/4 23 25000
94+
Ethernet92 13 Eth24/1 24 25000
95+
Ethernet93 14 Eth24/2 24 25000
96+
Ethernet94 15 Eth24/3 24 25000
97+
Ethernet95 16 Eth24/4 24 25000
98+
Ethernet96 17,18 Eth25/1 25 50000
99+
Ethernet98 19,20 Eth25/2 25 50000
100+
Ethernet100 21,22 Eth26/1 26 50000
101+
Ethernet102 23,24 Eth26/2 26 50000
102+
Ethernet104 25,26 Eth27/1 27 50000
103+
Ethernet106 27,28 Eth27/2 27 50000
104+
Ethernet108 29,30 Eth28/1 28 50000
105+
Ethernet110 31,32 Eth28/2 28 50000
106+
Ethernet112 113,114 Eth29/1 29 50000
107+
Ethernet114 115,116 Eth29/2 29 50000
108+
Ethernet116 117,118 Eth30/1 30 50000
109+
Ethernet118 119,120 Eth30/2 30 50000
110+
Ethernet120 121,122 Eth31/1 31 50000
111+
Ethernet122 123,124 Eth31/2 31 50000
112+
Ethernet124 125,126 Eth32/1 32 50000
113+
Ethernet126 127,128 Eth32/2 32 50000

0 commit comments

Comments
 (0)