Skip to content

Commit e966628

Browse files
bbinxiebbinxie
authored
Merge pull request sonic-net#170 from SONIC-DEV/201911
201911
2 parents 6a305da + 4a502ca commit e966628

File tree

52 files changed

+2663
-239
lines changed

Some content is hidden

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

52 files changed

+2663
-239
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-base-stretch/Dockerfile.j2

+4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ RUN apt-get update && \
4444
perl \
4545
procps \
4646
python \
47+
python-pip \
4748
rsyslog \
4849
vim-tiny \
4950
# Install dependencies of supervisor
@@ -63,6 +64,9 @@ RUN apt-get -y install \
6364
net-tools
6465
{% endif %}
6566

67+
# For templating
68+
RUN pip install j2cli
69+
6670
RUN mkdir -p /etc/supervisor /var/log/supervisor
6771

6872
RUN apt-get -y purge \

‎dockers/docker-database/Dockerfile.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RUN apt-get clean -y && \
3434

3535
COPY ["supervisord.conf.j2", "/usr/share/sonic/templates/"]
3636
COPY ["docker-database-init.sh", "/usr/local/bin/"]
37-
COPY ["ping_pong_db_insts", "/usr/local/bin/"]
38-
COPY ["database_config.json", "/etc/default/sonic-db/"]
37+
COPY ["database_config.json.j2", "/usr/share/sonic/templates/"]
38+
COPY ["database_global.json.j2", "/usr/share/sonic/templates/"]
3939
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
4040
COPY ["critical_processes", "/etc/supervisor"]
4141

‎dockers/docker-database/database_config.json renamed to ‎dockers/docker-database/database_config.json.j2

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"redis":{
44
"hostname" : "127.0.0.1",
55
"port" : 6379,
6-
"unix_socket_path" : "/var/run/redis/redis.sock"
6+
"unix_socket_path" : "/var/run/redis{{NAMESPACE_ID}}/redis.sock",
7+
"persistence_for_warm_boot" : "yes"
78
}
89
},
910
"DATABASES" : {

‎dockers/docker-database/database_global.json.j2

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{% set namespace_cnt = NAMESPACE_COUNT|int %}
2+
{
3+
"INCLUDES" : [
4+
{
5+
"include" : "../../redis/sonic-db/database_config.json"
6+
},
7+
{% if namespace_cnt > 1 %}
8+
{% for ns in range(namespace_cnt) %}
9+
{
10+
"namespace" : "{{NAMESPACE_PREFIX}}{{ns}}",
11+
"include" : "../../redis{{ns}}/sonic-db/database_config.json"
12+
{% if ns == namespace_cnt-1 %}
13+
}
14+
{% else %}
15+
},
16+
{% endif %}
17+
{% endfor %}
18+
],
19+
"VERSION" : "1.0"
20+
}
21+
{% endif %}

0 commit comments

Comments
 (0)