Skip to content

Commit 15ce0fc

Browse files
authored
Merge branch 'master' into submodule-master-sonic-swss
2 parents 5b5d035 + 7240644 commit 15ce0fc

File tree

82 files changed

+15892
-10
lines changed

Some content is hidden

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

82 files changed

+15892
-10
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{%- set default_topo = 't2' %}
2+
{%- include 'buffers_config.j2' %}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{%- set default_cable = '300m' %}
2+
3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'upperspinerouter_spinerouter' : '30m',
8+
'upperspinerouter_lowerspinerouter' : '30m',
9+
'regionalhub_upperspinerouter': '120000m',
10+
'aznghub_upperspinerouter' : '120000m',
11+
'regionalhub_spinerouter': '120000m',
12+
'aznghub_spinerouter' : '120000m'
13+
}
14+
-%}
15+
16+
{%- macro generate_port_lists(PORT_ALL) %}
17+
{# Generate list of ports #}
18+
{%- for port_idx in range(0,128,8) %}
19+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
20+
{%- endfor %}
21+
{%- for port_idx in range(128,256,4) %}
22+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
23+
{%- endfor %}
24+
{%- for port_idx in range(256,384,8) %}
25+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
26+
{%- endfor %}
27+
{%- endmacro %}
28+
29+
{%- macro generate_buffer_pool_and_profiles() %}
30+
"BUFFER_POOL": {
31+
"ingress_lossless_pool": {
32+
"size": "12884901888",
33+
"type": "both",
34+
"mode": "dynamic",
35+
"xoff": "3225378816"
36+
}
37+
},
38+
"BUFFER_PROFILE": {
39+
"ingress_lossy_profile": {
40+
"pool":"ingress_lossless_pool",
41+
"size":"0",
42+
"xon_offset": "0",
43+
"dynamic_th":"0"
44+
},
45+
"egress_lossless_profile": {
46+
"pool":"ingress_lossless_pool",
47+
"size":"0",
48+
"dynamic_th":"-1"
49+
},
50+
"egress_lossy_profile": {
51+
"pool":"ingress_lossless_pool",
52+
"size":"0",
53+
"dynamic_th":"-4"
54+
}
55+
},
56+
{%- endmacro %}
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"CONTEXTS": [
3+
{
4+
"guid" : 0,
5+
"name" : "asic0",
6+
"dbAsic" : "ASIC_DB",
7+
"dbCounters" : "COUNTERS_DB",
8+
"dbFlex": "FLEX_COUNTER_DB",
9+
"dbState" : "STATE_DB",
10+
"zmq_enable" : false,
11+
"zmq_endpoint": "tcp://127.0.0.1:5555",
12+
"zmq_ntf_endpoint": "tcp://127.0.0.1:5556",
13+
"switches": [
14+
{
15+
"index" : 0,
16+
"hwinfo" : ""
17+
}
18+
]
19+
},
20+
{
21+
"guid" : 1,
22+
"name" : "phys",
23+
"dbAsic" : "GB_ASIC_DB",
24+
"dbCounters" : "GB_COUNTERS_DB",
25+
"dbFlex": "GB_FLEX_COUNTER_DB",
26+
"dbState" : "STATE_DB",
27+
"zmq_enable" : false,
28+
"zmq_endpoint": "tcp://127.0.0.1:5565",
29+
"zmq_ntf_endpoint": "tcp://127.0.0.1:5566",
30+
"switches": [
31+
{
32+
"index" : 0,
33+
"hwinfo" : "mdio0_0_0/0"
34+
},
35+
{
36+
"index" : 1,
37+
"hwinfo" : "mdio1_0_0/0"
38+
},
39+
{
40+
"index" : 2,
41+
"hwinfo" : "mdio2_0_0/0"
42+
},
43+
{
44+
"index" : 3,
45+
"hwinfo" : "mdio3_0_0/0"
46+
},
47+
{
48+
"index" : 4,
49+
"hwinfo" : "mdio4_0_0/0"
50+
},
51+
{
52+
"index" : 5,
53+
"hwinfo" : "mdio5_0_0/0"
54+
},
55+
{
56+
"index" : 6,
57+
"hwinfo" : "mdio6_0_0/0"
58+
},
59+
{
60+
"index" : 7,
61+
"hwinfo" : "mdio7_0_0/0"
62+
},
63+
{
64+
"index" : 8,
65+
"hwinfo" : "mdio8_0_0/0"
66+
},
67+
{
68+
"index" : 9,
69+
"hwinfo" : "mdio9_0_0/0"
70+
},
71+
{
72+
"index" : 10,
73+
"hwinfo" : "mdio10_0_0/0"
74+
},
75+
{
76+
"index" : 11,
77+
"hwinfo" : "mdio11_0_0/0"
78+
},
79+
{
80+
"index" : 12,
81+
"hwinfo" : "mdio12_0_0/0"
82+
},
83+
{
84+
"index" : 13,
85+
"hwinfo" : "mdio13_0_0/0"
86+
},
87+
{
88+
"index" : 14,
89+
"hwinfo" : "mdio14_0_0/0"
90+
},
91+
{
92+
"index" : 15,
93+
"hwinfo" : "mdio15_0_0/0"
94+
}
95+
]
96+
}
97+
]
98+
}

0 commit comments

Comments
 (0)