Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

201811 #169

Merged
merged 9 commits into from
May 14, 2020
Merged

201811 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de05770
Extend debug image build ability to all platforms. (#3134) (#4524)
renukamanavalan May 4, 2020
9966a0a
[bgpcfgd]: fix missing reference
lguohan May 8, 2020
708d901
[bgpcfgd]: ip_addr is not defined (#4560)
qiluo-msft May 8, 2020
ceb8784
[process-reboot-cause] If software reboot cause is unknown add note i…
jleveque May 7, 2020
660b0be
[201811][sairedis] advance sairedis submodule head (#4562)
yxieca May 9, 2020
3d41c27
[qos]: Alpha and ECN settings change for Th (#4564)
neethajohn May 9, 2020
8d20030
[minigraph] Support FECDisabled in minigraph parser (#4556) (#4567)
qiluo-msft May 9, 2020
f52e59a
[ntp] enable/disable NTP long jump according to reboot type (#4582)
yxieca May 12, 2020
8e014bb
[baseimage]: pin down package version for azure-storage, watchdog and…
lguohan May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 1248 2288 165568 0 2288
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 53248 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 96096 0 2288
100000 40m 1248 2288 177632 0 2288
10000 300m 1248 2288 46176 0 2288
25000 300m 1248 2288 79040 0 2288
40000 300m 1248 2288 108160 0 2288
50000 300m 1248 2288 141856 0 2288
100000 300m 1248 2288 268736 0 2288
20 changes: 20 additions & 0 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "250000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}

{%- include 'qos_config.j2' %}
30 changes: 15 additions & 15 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 79872 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 56160 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 85696 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 79872 0 2288
100000 5m 1248 2288 165568 0 2288
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 56160 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 85696 0 2288
100000 40m 1248 2288 177632 0 2288
10000 300m 1248 2288 46176 0 2288
25000 300m 1248 2288 79040 0 2288
40000 300m 1248 2288 108160 0 2288
50000 300m 1248 2288 141856 0 2288
100000 300m 1248 2288 268736 0 2288
20 changes: 20 additions & 0 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "250000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}

{%- include 'qos_config.j2' %}
30 changes: 15 additions & 15 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 1248 2288 165568 0 2288
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 53248 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 96096 0 2288
100000 40m 1248 2288 177632 0 2288
10000 300m 1248 2288 46176 0 2288
25000 300m 1248 2288 79040 0 2288
40000 300m 1248 2288 108160 0 2288
50000 300m 1248 2288 141856 0 2288
100000 300m 1248 2288 268736 0 2288
20 changes: 20 additions & 0 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "250000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}

{%- include 'qos_config.j2' %}
30 changes: 15 additions & 15 deletions device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 1248 2288 165568 0 2288
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 53248 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 96096 0 2288
100000 40m 1248 2288 177632 0 2288
10000 300m 1248 2288 46176 0 2288
25000 300m 1248 2288 79040 0 2288
40000 300m 1248 2288 108160 0 2288
50000 300m 1248 2288 141856 0 2288
100000 300m 1248 2288 268736 0 2288
20 changes: 20 additions & 0 deletions device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "250000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}

{%- include 'qos_config.j2' %}
30 changes: 15 additions & 15 deletions device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 1248 2288 165568 0 2288
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 53248 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 96096 0 2288
100000 40m 1248 2288 177632 0 2288
10000 300m 1248 2288 46176 0 2288
25000 300m 1248 2288 79040 0 2288
40000 300m 1248 2288 108160 0 2288
50000 300m 1248 2288 141856 0 2288
100000 300m 1248 2288 268736 0 2288
20 changes: 20 additions & 0 deletions device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "250000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}

{%- include 'qos_config.j2' %}
30 changes: 15 additions & 15 deletions device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 79872 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 56160 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 85696 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 79872 0 2288
100000 5m 1248 2288 165568 0 2288
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 56160 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 85696 0 2288
100000 40m 1248 2288 177632 0 2288
10000 300m 1248 2288 46176 0 2288
25000 300m 1248 2288 79040 0 2288
40000 300m 1248 2288 108160 0 2288
50000 300m 1248 2288 141856 0 2288
100000 300m 1248 2288 268736 0 2288
20 changes: 20 additions & 0 deletions device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "250000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}

{%- include 'qos_config.j2' %}
4 changes: 2 additions & 2 deletions dockers/docker-fpm-quagga/bgpcfgd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ class BGPConfigManager(object):
else:
syslog.syslog(syslog.LOG_ERR, "Got ambigous ip addres '%s'" % ip_addr)
except:
syslog.syslog(syslog.LOG_ERR, "Error while rendering set src template" % ip_addr)
syslog.syslog(syslog.LOG_ERR, "Error while rendering set src template '%s'" % ip_addr)
else:
cmds.append(txt)
syslog.syslog(syslog.LOG_INFO, "Generate set src configuration with Loopback0 ipv4 '%s'" % ip_addr)
elif op == swsscommon.DEL_COMMAND:
syslog.syslog(syslog.LOG_INFO, "Delete command is not supported for set src templates" % ip_addr)
syslog.syslog(syslog.LOG_INFO, "Delete command is not supported for set src templates")

for cmd in cmds:
self.__apply_cmd(cmd, zebra=True)
Expand Down
4 changes: 4 additions & 0 deletions files/build_templates/qos_config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@

{% endfor %}
},
{% if generate_wred_profiles is defined %}
{{- generate_wred_profiles() }}
{% else %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
Expand All @@ -194,6 +197,7 @@
"red_drop_probability" : "5"
}
},
{% endif %}
"QUEUE": {
{% for port in PORT_ACTIVE %}
"{{ port }}|3": {
Expand Down
6 changes: 3 additions & 3 deletions files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable core_uploader.service
sudo cp $IMAGE_CONFIGS/corefile_uploader/core_uploader.py $FILESYSTEM_ROOT/usr/bin/
sudo cp $IMAGE_CONFIGS/corefile_uploader/core_analyzer.rc.json $FILESYSTEM_ROOT_ETC_SONIC/
sudo chmod og-rw $FILESYSTEM_ROOT_ETC_SONIC/core_analyzer.rc.json
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install azure-storage
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install watchdog
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install futures
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install azure-storage==0.36.0
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install watchdog==0.10.2
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install futures==3.3.0

# Copy the buffer configuration template
sudo cp $BUILD_TEMPLATES/buffers_config.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
Expand Down
Loading