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

201811 #44

Merged
merged 29 commits into from
Feb 15, 2019
Merged

201811 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
746cd16
[sub module] move sairedis and swss to 201811 branch (#2508)
yxieca Jan 31, 2019
38c08df
[reboot cause] Move reboot-cause files to /host directory so they per…
jleveque Jan 29, 2019
dac983e
Disable IPv6 ra for eth0 interface (#2493)
prsunny Jan 29, 2019
cdbbb7e
[QoS]: QoS Config change for multiple devices (#2505)
wendani Jan 31, 2019
f167e67
[baseimage] Delay ntp-config service to start after 5 minutes (#2494)
jleveque Jan 31, 2019
e9125b9
[swss]: Change VrfMgrd startup order, cleanup VRF_TABLE from state DB…
prsunny Feb 1, 2019
e6bc80f
[mlnx] Fix sai xml path for boxer platform (#2516)
stepanblyschak Feb 1, 2019
8e8c18f
[submodule] update sonic-snmpagent (#2517)
mykolaf Feb 2, 2019
4a24103
[updategraph] After system upgrade, restore files/directories with or…
zhenggen-xu Feb 2, 2019
7808f3c
[build]: add fastentrypoints which is used for sonic-utilities build …
ishidawataru Jan 24, 2019
b1bdecb
[QoS]: Link pg 2 and 6 to lossy buffer profile (#2511)
wendani Feb 1, 2019
7d5cb91
[submodule 201811] advance sairedis and swss submodule for 201811 bra…
yxieca Feb 6, 2019
c88f168
[sub module] sub module sonic-swss-common tracking 201811 branch (#2530)
yxieca Feb 6, 2019
a98fe06
[submodule] update utilities pointer (#2523)
mykolaf Feb 4, 2019
4023a77
[QoS]: fix size and xoff value on a7050-QX-32S, -QX32, and s6000(#2527)
yxieca Feb 7, 2019
accaacc
[docker-snmp] Install pyyaml in the container (#2533)
Staphylo Feb 7, 2019
b4bc4b7
[sub module] advance sonic-swss sub module (#2539)
yxieca Feb 8, 2019
f9f9a64
[bcm sai] Upgrade Broadcom SAI to version 3.3.4.3-2 (#2550)
yxieca Feb 12, 2019
24bce77
[swss/syncd] log swss/syncd service script activities (#2545)
yxieca Feb 10, 2019
a65e47f
[lldpmgr] add mgmt ip to lldpd conf template, handle port description…
mykolaf Jan 30, 2019
ab19d13
[minigraph.py] generate port description for every port (#2395)
mykolaf Feb 4, 2019
a7e013b
[submodule]: update sonic-dbsyncd
lguohan Feb 12, 2019
41bb13b
configure the hostname for lldpd
lguohan Feb 12, 2019
bab38e4
setup port description if minigraph has neighbor information
lguohan Feb 12, 2019
6f2274a
configure lldp when the port exists
lguohan Feb 12, 2019
11fa090
start lldp-syncd and lldpmgrd after lldpd fully started
lguohan Feb 12, 2019
d10275e
Updated SAI XML config for SN2010. (#2561)
nazariig Feb 14, 2019
c0f82b3
[HWSKU] Define HWSKU Arista-7260CX3-Q64 and Arista-7260CX3-Q44 (#2562)
yxieca Feb 14, 2019
4faa5f2
[warm boot] cherry-pick PR #2538 and advance related sub-modules (#2569)
yxieca Feb 14, 2019
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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
[submodule "sonic-swss-common"]
path = src/sonic-swss-common
url = https://github.com/Azure/sonic-swss-common
branch = 201811
[submodule "sonic-linux-kernel"]
path = src/sonic-linux-kernel
url = https://github.com/Azure/sonic-linux-kernel
[submodule "sonic-sairedis"]
path = src/sonic-sairedis
url = https://github.com/Azure/sonic-sairedis
branch = 201811
[submodule "sonic-swss"]
path = src/sonic-swss
url = https://github.com/Azure/sonic-swss
branch = 201811
[submodule "src/p4c-bm/p4c-bm"]
path = platform/p4/p4c-bm/p4c-bm
url = https://github.com/krambn/p4c-bm
Expand Down
1 change: 1 addition & 0 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ set /files/etc/sysctl.conf/net.ipv6.conf.all.keep_addr_on_down 1
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.keep_addr_on_down 1

set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra_defrtr 0
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra 0

set /files/etc/sysctl.conf/net.core.rmem_max 2097152
set /files/etc/sysctl.conf/net.core.wmem_max 2097152
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
18 changes: 9 additions & 9 deletions device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 5m 41808 18432 40560 -3 2496
50000 5m 41808 18432 40560 -3 2496
100000 5m 41808 18432 40560 -3 2496
40000 40m 51376 18432 50128 -3 2496
50000 40m 51376 18432 50128 -3 2496
100000 40m 51376 18432 50128 -3 2496
40000 300m 51376 18432 50128 -3 2496
50000 300m 51376 18432 50128 -3 2496
100000 300m 51376 18432 50128 -3 2496
40000 5m 56368 18432 55120 -3 2496
50000 5m 56368 18432 55120 -3 2496
100000 5m 56368 18432 55120 -3 2496
40000 40m 56368 18432 55120 -3 2496
50000 40m 56368 18432 55120 -3 2496
100000 40m 56368 18432 55120 -3 2496
40000 300m 56368 18432 55120 -3 2496
50000 300m 56368 18432 55120 -3 2496
100000 300m 56368 18432 55120 -3 2496
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
18 changes: 9 additions & 9 deletions device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 5m 41808 18432 40560 -3 2496
50000 5m 41808 18432 40560 -3 2496
100000 5m 41808 18432 40560 -3 2496
40000 40m 51376 18432 50128 -3 2496
50000 40m 51376 18432 50128 -3 2496
100000 40m 51376 18432 50128 -3 2496
40000 300m 51376 18432 50128 -3 2496
50000 300m 51376 18432 50128 -3 2496
100000 300m 51376 18432 50128 -3 2496
40000 5m 56368 18432 55120 -3 2496
50000 5m 56368 18432 55120 -3 2496
100000 5m 56368 18432 55120 -3 2496
40000 40m 56368 18432 55120 -3 2496
50000 40m 56368 18432 55120 -3 2496
100000 40m 56368 18432 55120 -3 2496
40000 300m 56368 18432 55120 -3 2496
50000 300m 56368 18432 55120 -3 2496
100000 300m 56368 18432 55120 -3 2496
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "11213696",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "3855488"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "9532224",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "10443264",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "4625920"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "8877440",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "11213696",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "3855488"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "9532224",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Up @@ -13,5 +13,5 @@
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 131456 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "11213696",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "3855488"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "9532224",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "10443264",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "4625920"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "8877440",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "32799936",
"size": "33329088",
"type": "ingress",
"mode": "dynamic",
"xoff": "8356608"
"xoff": "7827456"
},
"egress_lossy_pool": {
"size": "26240448",
"size": "26663272",
"type": "egress",
"mode": "dynamic"
},
Expand Down
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q44
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Arista-7260CX3-Q64
3 changes: 3 additions & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{%- set default_topo = 't0' %}
{%- include 'buffers_config.j2' %}

46 changes: 46 additions & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{%- set default_cable = '5m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
{%- for port_idx in range(0,64) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33329088",
"type": "ingress",
"mode": "dynamic",
"xoff": "7827456"
},
"egress_lossy_pool": {
"size": "26663272",
"type": "egress",
"mode": "dynamic"
},
"egress_lossless_pool": {
"size": "42349632",
"type": "egress",
"mode": "static"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"static_th":"11075584"
},
"egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"0",
"static_th":"10587408"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1664",
"dynamic_th":"-1"
}
},
{%- endmacro %}
11 changes: 11 additions & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 5m 1248 1248 56160 -3 2496
50000 5m 1248 1248 56160 -3 2496
100000 5m 1248 1248 96928 -3 2496
40000 40m 1248 1248 56160 -3 2496
50000 40m 1248 1248 56160 -3 2496
100000 40m 1248 1248 96928 -3 2496
40000 300m 1248 1248 56160 -3 2496
50000 300m 1248 1248 56160 -3 2496
100000 300m 1248 1248 96928 -3 2496
67 changes: 67 additions & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/port_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# name lanes alias index speed
Ethernet0 77,78,79,80 Ethernet1/1 1 40000
Ethernet4 65,66,67,68 Ethernet2/1 2 40000
Ethernet8 85,86,87,88 Ethernet3/1 3 40000
Ethernet12 89,90,91,92 Ethernet4/1 4 40000
Ethernet16 109,110,111,112 Ethernet5/1 5 40000
Ethernet20 97,98,99,100 Ethernet6/1 6 40000
Ethernet24 5,6,7,8 Ethernet7/1 7 40000
Ethernet28 13,14,15,16 Ethernet8/1 8 40000
Ethernet32 25,26,27,28 Ethernet9/1 9 40000
Ethernet36 21,22,23,24 Ethernet10/1 10 40000
Ethernet40 37,38,39,40 Ethernet11/1 11 40000
Ethernet44 45,46,47,48 Ethernet12/1 12 40000
Ethernet48 57,58,59,60 Ethernet13/1 13 40000
Ethernet52 53,54,55,56 Ethernet14/1 14 40000
Ethernet56 117,118,119,120 Ethernet15/1 15 40000
Ethernet60 121,122,123,124 Ethernet16/1 16 40000
Ethernet64 141,142,143,144 Ethernet17/1 17 40000
Ethernet68 133,134,135,136 Ethernet18/1 18 40000
Ethernet72 197,198,199,200 Ethernet19/1 19 40000
Ethernet76 205,206,207,208 Ethernet20/1 20 40000
Ethernet80 217,218,219,220 Ethernet21/1 21 40000
Ethernet84 213,214,215,216 Ethernet22/1 22 40000
Ethernet88 229,230,231,232 Ethernet23/1 23 40000
Ethernet92 237,238,239,240 Ethernet24/1 24 40000
Ethernet96 249,250,251,252 Ethernet25/1 25 40000
Ethernet100 245,246,247,248 Ethernet26/1 26 40000
Ethernet104 149,150,151,152 Ethernet27/1 27 40000
Ethernet108 153,154,155,156 Ethernet28/1 28 40000
Ethernet112 173,174,175,176 Ethernet29/1 29 40000
Ethernet116 161,162,163,164 Ethernet30/1 30 40000
Ethernet120 181,182,183,184 Ethernet31/1 31 40000
Ethernet124 185,186,187,188 Ethernet32/1 32 40000
Ethernet128 69,70,71,72 Ethernet33/1 33 40000
Ethernet132 73,74,75,76 Ethernet34/1 34 40000
Ethernet136 93,94,95,96 Ethernet35/1 35 40000
Ethernet140 81,82,83,84 Ethernet36/1 36 40000
Ethernet144 101,102,103,104 Ethernet37/1 37 40000
Ethernet148 105,106,107,108 Ethernet38/1 38 40000
Ethernet152 9,10,11,12 Ethernet39/1 39 40000
Ethernet156 1,2,3,4 Ethernet40/1 40 40000
Ethernet160 17,18,19,20 Ethernet41/1 41 40000
Ethernet164 29,30,31,32 Ethernet42/1 42 40000
Ethernet168 41,42,43,44 Ethernet43/1 43 40000
Ethernet172 33,34,35,36 Ethernet44/1 44 40000
Ethernet176 49,50,51,52 Ethernet45/1 45 40000
Ethernet180 61,62,63,64 Ethernet46/1 46 40000
Ethernet184 125,126,127,128 Ethernet47/1 47 40000
Ethernet188 113,114,115,116 Ethernet48/1 48 40000
Ethernet192 129,130,131,132 Ethernet49/1 49 40000
Ethernet196 137,138,139,140 Ethernet50/1 50 40000
Ethernet200 201,202,203,204 Ethernet51/1 51 40000
Ethernet204 193,194,195,196 Ethernet52/1 52 40000
Ethernet208 209,210,211,212 Ethernet53/1 53 40000
Ethernet212 221,222,223,224 Ethernet54/1 54 40000
Ethernet216 233,234,235,236 Ethernet55/1 55 40000
Ethernet220 225,226,227,228 Ethernet56/1 56 40000
Ethernet224 241,242,243,244 Ethernet57/1 57 40000
Ethernet228 253,254,255,256 Ethernet58/1 58 40000
Ethernet232 157,158,159,160 Ethernet59/1 59 40000
Ethernet236 145,146,147,148 Ethernet60/1 60 40000
Ethernet240 165,166,167,168 Ethernet61/1 61 40000
Ethernet244 169,170,171,172 Ethernet62/1 62 40000
Ethernet248 189,190,191,192 Ethernet63/1 63 40000
Ethernet252 177,178,179,180 Ethernet64/1 64 40000
Ethernet256 257 Ethernet65 65 10000
Ethernet260 259 Ethernet66 66 10000
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{%- include 'qos_config.j2' %}
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/sai.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x40G.config.bcm
Loading