Skip to content

Commit f4f6955

Browse files
PterosaurPterosaur
authored
[devices]: Add new SKU for SONiC VM (#8971)
The default ethernet port naming style is Ethernet0, Ethernet4...Ethernet(i*4) which isn't compatible with EOS's style Ethernet1,Ethernet2...Etherent(i+1) SONiC-mgmt usually use EOS as neighbor devices. To relieve the compatible issue on SONiC as neighbor devices, This PR introduces a new SKU SONiC VM. Signed-off-by: Ze Gan <[email protected]>
1 parent b9366f3 commit f4f6955

13 files changed

+901
-0
lines changed

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/buffers.json.j2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{%- set default_topo = 't1' %}
2+
{%- include 'buffers_config.j2' %}
3+

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/buffers_defaults_def.j2

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{%- set default_cable = '0m' %}
2+
3+
{%- macro generate_port_lists(PORT_ALL) %}
4+
{# Generate list of ports #}
5+
{% for port_idx in range(0,32) %}
6+
{% if PORT_ALL.append("Ethernet%d" % (port_idx + 1)) %}{% endif %}
7+
{% endfor %}
8+
{%- endmacro %}
9+
10+
{%- macro generate_buffer_pool_and_profiles() %}
11+
"BUFFER_POOL": {
12+
"ingress_lossless_pool": {
13+
"size": "12766208",
14+
"type": "ingress",
15+
"mode": "dynamic"
16+
},
17+
"egress_lossless_pool": {
18+
"size": "12766208",
19+
"type": "egress",
20+
"mode": "static"
21+
},
22+
"egress_lossy_pool": {
23+
"size": "7326924",
24+
"type": "egress",
25+
"mode": "dynamic"
26+
}
27+
},
28+
"BUFFER_PROFILE": {
29+
"ingress_lossy_profile": {
30+
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
31+
"size":"0",
32+
"dynamic_th":"3"
33+
},
34+
"egress_lossless_profile": {
35+
"pool":"[BUFFER_POOL|egress_lossless_pool]",
36+
"size":"0",
37+
"static_th":"12766208"
38+
},
39+
"egress_lossy_profile": {
40+
"pool":"[BUFFER_POOL|egress_lossy_pool]",
41+
"size":"1518",
42+
"dynamic_th":"3"
43+
}
44+
},
45+
{%- endmacro %}

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/buffers_defaults_t0.j2

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{%- set default_cable = '0m' %}
2+
3+
{%- macro generate_port_lists(PORT_ALL) %}
4+
{# Generate list of ports #}
5+
{% for port_idx in range(0,32) %}
6+
{% if PORT_ALL.append("Ethernet%d" % (port_idx + 1)) %}{% endif %}
7+
{% endfor %}
8+
{%- endmacro %}
9+
10+
{%- macro generate_buffer_pool_and_profiles() %}
11+
"BUFFER_POOL": {
12+
"ingress_lossless_pool": {
13+
"size": "12766208",
14+
"type": "ingress",
15+
"mode": "dynamic"
16+
},
17+
"egress_lossless_pool": {
18+
"size": "12766208",
19+
"type": "egress",
20+
"mode": "static"
21+
},
22+
"egress_lossy_pool": {
23+
"size": "7326924",
24+
"type": "egress",
25+
"mode": "dynamic"
26+
}
27+
},
28+
"BUFFER_PROFILE": {
29+
"ingress_lossy_profile": {
30+
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
31+
"size":"0",
32+
"dynamic_th":"3"
33+
},
34+
"egress_lossless_profile": {
35+
"pool":"[BUFFER_POOL|egress_lossless_pool]",
36+
"size":"0",
37+
"static_th":"12766208"
38+
},
39+
"egress_lossy_profile": {
40+
"pool":"[BUFFER_POOL|egress_lossy_pool]",
41+
"size":"1518",
42+
"dynamic_th":"3"
43+
}
44+
},
45+
{%- endmacro %}

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/buffers_defaults_t1.j2

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{%- set default_cable = '0m' %}
2+
3+
{%- macro generate_port_lists(PORT_ALL) %}
4+
{# Generate list of ports #}
5+
{% for port_idx in range(0,32) %}
6+
{% if PORT_ALL.append("Ethernet%d" % (port_idx + 1)) %}{% endif %}
7+
{% endfor %}
8+
{%- endmacro %}
9+
10+
{%- macro generate_buffer_pool_and_profiles() %}
11+
"BUFFER_POOL": {
12+
"ingress_lossless_pool": {
13+
"size": "12766208",
14+
"type": "ingress",
15+
"mode": "dynamic"
16+
},
17+
"egress_lossless_pool": {
18+
"size": "12766208",
19+
"type": "egress",
20+
"mode": "static"
21+
},
22+
"egress_lossy_pool": {
23+
"size": "7326924",
24+
"type": "egress",
25+
"mode": "dynamic"
26+
}
27+
},
28+
"BUFFER_PROFILE": {
29+
"ingress_lossy_profile": {
30+
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
31+
"size":"0",
32+
"dynamic_th":"3"
33+
},
34+
"egress_lossless_profile": {
35+
"pool":"[BUFFER_POOL|egress_lossless_pool]",
36+
"size":"0",
37+
"static_th":"12766208"
38+
},
39+
"egress_lossy_profile": {
40+
"pool":"[BUFFER_POOL|egress_lossy_pool]",
41+
"size":"1518",
42+
"dynamic_th":"3"
43+
}
44+
},
45+
{%- endmacro %}

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/fabriclanemap.ini

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
fabric1:1
2+
fabric2:2
3+
fabric3:3
4+
fabric4:4
5+
fabric5:5
6+
fabric6:6
7+
fabric7:7
8+
fabric8:8
9+
fabric9:9
10+
fabric10:10
11+
fabric11:11
12+
fabric12:12
13+
fabric13:13
14+
fabric14:14
15+
fabric15:15
16+
fabric16:16

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/lanemap.ini

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
eth1:25,26,27,28
2+
eth2:29,30,31,32
3+
eth3:33,34,35,36
4+
eth4:37,38,39,40
5+
eth5:45,46,47,48
6+
eth6:41,42,43,44
7+
eth7:1,2,3,4
8+
eth8:5,6,7,8
9+
eth9:13,14,15,16
10+
eth10:9,10,11,12
11+
eth11:17,18,19,20
12+
eth12:21,22,23,24
13+
eth13:53,54,55,56
14+
eth14:49,50,51,52
15+
eth15:57,58,59,60
16+
eth16:61,62,63,64
17+
eth17:69,70,71,72
18+
eth18:65,66,67,68
19+
eth19:73,74,75,76
20+
eth20:77,78,79,80
21+
eth21:109,110,111,112
22+
eth22:105,106,107,108
23+
eth23:113,114,115,116
24+
eth24:117,118,119,120
25+
eth25:125,126,127,128
26+
eth26:121,122,123,124
27+
eth27:81,82,83,84
28+
eth28:85,86,87,88
29+
eth29:93,94,95,96
30+
eth30:89,90,91,92
31+
eth31:101,102,103,104
32+
eth32:97,98,99,100

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/pai.profile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM81724
2+
SAI_VS_SAI_SWITCH_TYPE=SAI_SWITCH_TYPE_PHY
3+
SAI_VS_HOSTIF_USE_TAP_DEVICE=false
4+
SAI_VS_USE_BCMSIM_LINK_MON=true
5+
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/pg_profile_lookup.ini

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# PG lossless profiles.
2+
# speed cable size xon xoff threshold xon_offset
3+
10000 5m 56368 18432 55120 -3 2496
4+
25000 5m 56368 18432 55120 -3 2496
5+
40000 5m 56368 18432 55120 -3 2496
6+
50000 5m 56368 18432 55120 -3 2496
7+
100000 5m 56368 18432 55120 -3 2496
8+
10000 40m 56368 18432 55120 -3 2496
9+
25000 40m 56368 18432 55120 -3 2496
10+
40000 40m 56368 18432 55120 -3 2496
11+
50000 40m 56368 18432 55120 -3 2496
12+
100000 40m 56368 18432 55120 -3 2496
13+
10000 300m 56368 18432 55120 -3 2496
14+
25000 300m 56368 18432 55120 -3 2496
15+
40000 300m 56368 18432 55120 -3 2496
16+
50000 300m 56368 18432 55120 -3 2496
17+
100000 300m 56368 18432 55120 -3 2496

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/port_config.ini

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# name lanes alias index speed
2+
Ethernet1 25,26,27,28 fortyGigE0/0 0 40000
3+
Ethernet2 29,30,31,32 fortyGigE0/4 1 40000
4+
Ethernet3 33,34,35,36 fortyGigE0/8 2 40000
5+
Ethernet4 37,38,39,40 fortyGigE0/12 3 40000
6+
Ethernet5 45,46,47,48 fortyGigE0/16 4 40000
7+
Ethernet6 41,42,43,44 fortyGigE0/20 5 40000
8+
Ethernet7 1,2,3,4 fortyGigE0/24 6 40000
9+
Ethernet8 5,6,7,8 fortyGigE0/28 7 40000
10+
Ethernet9 13,14,15,16 fortyGigE0/32 8 40000
11+
Ethernet10 9,10,11,12 fortyGigE0/36 9 40000
12+
Ethernet11 17,18,19,20 fortyGigE0/40 10 40000
13+
Ethernet12 21,22,23,24 fortyGigE0/44 11 40000
14+
Ethernet13 53,54,55,56 fortyGigE0/48 12 40000
15+
Ethernet14 49,50,51,52 fortyGigE0/52 13 40000
16+
Ethernet15 57,58,59,60 fortyGigE0/56 14 40000
17+
Ethernet16 61,62,63,64 fortyGigE0/60 15 40000
18+
Ethernet17 69,70,71,72 fortyGigE0/64 16 40000
19+
Ethernet18 65,66,67,68 fortyGigE0/68 17 40000
20+
Ethernet19 73,74,75,76 fortyGigE0/72 18 40000
21+
Ethernet20 77,78,79,80 fortyGigE0/76 19 40000
22+
Ethernet21 109,110,111,112 fortyGigE0/80 20 40000
23+
Ethernet22 105,106,107,108 fortyGigE0/84 21 40000
24+
Ethernet23 113,114,115,116 fortyGigE0/88 22 40000
25+
Ethernet24 117,118,119,120 fortyGigE0/92 23 40000
26+
Ethernet25 125,126,127,128 fortyGigE0/96 24 40000
27+
Ethernet26 121,122,123,124 fortyGigE0/100 25 40000
28+
Ethernet27 81,82,83,84 fortyGigE0/104 26 40000
29+
Ethernet28 85,86,87,88 fortyGigE0/108 27 40000
30+
Ethernet29 93,94,95,96 fortyGigE0/112 28 40000
31+
Ethernet30 89,90,91,92 fortyGigE0/116 29 40000
32+
Ethernet31 101,102,103,104 fortyGigE0/120 30 40000
33+
Ethernet32 97,98,99,100 fortyGigE0/124 31 40000

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/qos.json.j2

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{%- include 'qos_config.j2' %}

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/sai.profile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
2+
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
3+
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
4+
SAI_VS_CORE_PORT_INDEX_MAP_FILE=/usr/share/sonic/hwsku/coreportindexmap.ini
5+
SAI_VS_INTERFACE_FABRIC_LANE_MAP_FILE=/usr/share/sonic/hwsku/fabriclanemap.ini

‎device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/sai_mlnx.profile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_MLNX2700
2+
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
3+
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
4+
SAI_VS_CORE_PORT_INDEX_MAP_FILE=/usr/share/sonic/hwsku/coreportindexmap.ini
5+
SAI_VS_INTERFACE_FABRIC_LANE_MAP_FILE=/usr/share/sonic/hwsku/fabriclanemap.ini

0 commit comments

Comments
 (0)