Skip to content

Commit 5daa83a

Browse files
Alex-DaiAlex-Dai
authored
Merge pull request sonic-net#169 from Azure/201811
201811
2 parents e63070a + 8e014bb commit 5daa83a

File tree

31 files changed

+2287
-113
lines changed

31 files changed

+2287
-113
lines changed

‎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' %}

‎device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/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/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/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' %}

‎dockers/docker-fpm-quagga/bgpcfgd

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ class BGPConfigManager(object):
159159
else:
160160
syslog.syslog(syslog.LOG_ERR, "Got ambigous ip addres '%s'" % ip_addr)
161161
except:
162-
syslog.syslog(syslog.LOG_ERR, "Error while rendering set src template" % ip_addr)
162+
syslog.syslog(syslog.LOG_ERR, "Error while rendering set src template '%s'" % ip_addr)
163163
else:
164164
cmds.append(txt)
165165
syslog.syslog(syslog.LOG_INFO, "Generate set src configuration with Loopback0 ipv4 '%s'" % ip_addr)
166166
elif op == swsscommon.DEL_COMMAND:
167-
syslog.syslog(syslog.LOG_INFO, "Delete command is not supported for set src templates" % ip_addr)
167+
syslog.syslog(syslog.LOG_INFO, "Delete command is not supported for set src templates")
168168

169169
for cmd in cmds:
170170
self.__apply_cmd(cmd, zebra=True)

‎files/build_templates/qos_config.j2

+4
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@
177177

178178
{% endfor %}
179179
},
180+
{% if generate_wred_profiles is defined %}
181+
{{- generate_wred_profiles() }}
182+
{% else %}
180183
"WRED_PROFILE": {
181184
"AZURE_LOSSLESS" : {
182185
"wred_green_enable" : "true",
@@ -194,6 +197,7 @@
194197
"red_drop_probability" : "5"
195198
}
196199
},
200+
{% endif %}
197201
"QUEUE": {
198202
{% for port in PORT_ACTIVE %}
199203
"{{ port }}|3": {

‎files/build_templates/sonic_debian_extension.j2

+3-3
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable core_uploader.service
198198
sudo cp $IMAGE_CONFIGS/corefile_uploader/core_uploader.py $FILESYSTEM_ROOT/usr/bin/
199199
sudo cp $IMAGE_CONFIGS/corefile_uploader/core_analyzer.rc.json $FILESYSTEM_ROOT_ETC_SONIC/
200200
sudo chmod og-rw $FILESYSTEM_ROOT_ETC_SONIC/core_analyzer.rc.json
201-
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install azure-storage
202-
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install watchdog
203-
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install futures
201+
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install azure-storage==0.36.0
202+
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install watchdog==0.10.2
203+
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install futures==3.3.0
204204

205205
# Copy the buffer configuration template
206206
sudo cp $BUILD_TEMPLATES/buffers_config.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/

0 commit comments

Comments
 (0)