Skip to content

Commit 65b3774

Browse files
simonJi2018lguohan
authored andcommitted
[nehpos] fix libsainps and nps-sdk bug for support sai 1.2.4 (sonic-net#1639)
1 parent 4dc327d commit 65b3774

File tree

8 files changed

+468
-6
lines changed

8 files changed

+468
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
{
2+
"TC_TO_PRIORITY_GROUP_MAP": {
3+
"AZURE": {
4+
"0": "1",
5+
"1": "0",
6+
"3": "3",
7+
"4": "4"
8+
}
9+
},
10+
"MAP_PFC_PRIORITY_TO_QUEUE": {
11+
"AZURE": {
12+
"3": "3",
13+
"4": "4"
14+
}
15+
},
16+
"TC_TO_QUEUE_MAP": {
17+
"AZURE": {
18+
"0": "1",
19+
"1": "0",
20+
"3": "3",
21+
"4": "4"
22+
}
23+
},
24+
"DSCP_TO_TC_MAP": {
25+
"AZURE": {
26+
"0":"1",
27+
"1":"0",
28+
"2":"0",
29+
"3":"3",
30+
"4":"4",
31+
"5":"0",
32+
"6":"0",
33+
"7":"0",
34+
"8":"1",
35+
"9":"0",
36+
"10":"0",
37+
"11":"0",
38+
"12":"0",
39+
"13":"0",
40+
"14":"0",
41+
"15":"0",
42+
"16":"0",
43+
"17":"0",
44+
"18":"0",
45+
"19":"0",
46+
"20":"0",
47+
"21":"0",
48+
"22":"0",
49+
"23":"0",
50+
"24":"0",
51+
"25":"0",
52+
"26":"0",
53+
"27":"0",
54+
"28":"0",
55+
"29":"0",
56+
"30":"0",
57+
"31":"0",
58+
"32":"0",
59+
"33":"0",
60+
"34":"0",
61+
"35":"0",
62+
"36":"0",
63+
"37":"0",
64+
"38":"0",
65+
"39":"0",
66+
"40":"0",
67+
"41":"0",
68+
"42":"0",
69+
"43":"0",
70+
"44":"0",
71+
"45":"0",
72+
"46":"0",
73+
"47":"0",
74+
"48":"0",
75+
"49":"0",
76+
"50":"0",
77+
"51":"0",
78+
"52":"0",
79+
"53":"0",
80+
"54":"0",
81+
"55":"0",
82+
"56":"0",
83+
"57":"0",
84+
"58":"0",
85+
"59":"0",
86+
"60":"0",
87+
"61":"0",
88+
"62":"0",
89+
"63":"0"
90+
}
91+
},
92+
"SCHEDULER": {
93+
"scheduler.0" : {
94+
"type":"DWRR",
95+
"weight": "25"
96+
},
97+
"scheduler.1" : {
98+
"type":"DWRR",
99+
"weight": "30"
100+
},
101+
"scheduler.2" : {
102+
"type":"DWRR",
103+
"weight": "20"
104+
}
105+
},
106+
"PORT_QOS_MAP": {
107+
"Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53": {
108+
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
109+
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
110+
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
111+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
112+
"pfc_enable": "3,4"
113+
}
114+
},
115+
"WRED_PROFILE": {
116+
"AZURE_LOSSY" : {
117+
"wred_green_enable":"true",
118+
"wred_yellow_enable":"true",
119+
"wred_red_enable":"true",
120+
"ecn":"ecn_all",
121+
"red_max_threshold":"516096",
122+
"red_min_threshold":"516096",
123+
"yellow_max_threshold":"516096",
124+
"yellow_min_threshold":"516096",
125+
"green_max_threshold": "184128",
126+
"green_min_threshold": "184128"
127+
},
128+
"AZURE_LOSSLESS" : {
129+
"wred_green_enable":"true",
130+
"wred_yellow_enable":"true",
131+
"wred_red_enable":"true",
132+
"ecn":"ecn_all",
133+
"red_max_threshold":"516096",
134+
"red_min_threshold":"516096",
135+
"yellow_max_threshold":"516096",
136+
"yellow_min_threshold":"516096",
137+
"green_max_threshold": "184128",
138+
"green_min_threshold": "184128"
139+
}
140+
},
141+
"QUEUE": {
142+
"Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53|3-4" : {
143+
"scheduler" : "[SCHEDULER|scheduler.0]",
144+
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]"
145+
},
146+
"Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53|0" : {
147+
"scheduler" : "[SCHEDULER|scheduler.1]"
148+
},
149+
"Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53|1" : {
150+
"scheduler" : "[SCHEDULER|scheduler.2]"
151+
}
152+
}
153+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
{
2+
"TC_TO_PRIORITY_GROUP_MAP": {
3+
"AZURE": {
4+
"0": "1",
5+
"1": "0",
6+
"3": "3",
7+
"4": "4"
8+
}
9+
},
10+
"MAP_PFC_PRIORITY_TO_QUEUE": {
11+
"AZURE": {
12+
"3": "3",
13+
"4": "4"
14+
}
15+
},
16+
"TC_TO_QUEUE_MAP": {
17+
"AZURE": {
18+
"0": "1",
19+
"1": "0",
20+
"3": "3",
21+
"4": "4"
22+
}
23+
},
24+
"DSCP_TO_TC_MAP": {
25+
"AZURE": {
26+
"0":"1",
27+
"1":"0",
28+
"2":"0",
29+
"3":"3",
30+
"4":"4",
31+
"5":"0",
32+
"6":"0",
33+
"7":"0",
34+
"8":"1",
35+
"9":"0",
36+
"10":"0",
37+
"11":"0",
38+
"12":"0",
39+
"13":"0",
40+
"14":"0",
41+
"15":"0",
42+
"16":"0",
43+
"17":"0",
44+
"18":"0",
45+
"19":"0",
46+
"20":"0",
47+
"21":"0",
48+
"22":"0",
49+
"23":"0",
50+
"24":"0",
51+
"25":"0",
52+
"26":"0",
53+
"27":"0",
54+
"28":"0",
55+
"29":"0",
56+
"30":"0",
57+
"31":"0",
58+
"32":"0",
59+
"33":"0",
60+
"34":"0",
61+
"35":"0",
62+
"36":"0",
63+
"37":"0",
64+
"38":"0",
65+
"39":"0",
66+
"40":"0",
67+
"41":"0",
68+
"42":"0",
69+
"43":"0",
70+
"44":"0",
71+
"45":"0",
72+
"46":"0",
73+
"47":"0",
74+
"48":"0",
75+
"49":"0",
76+
"50":"0",
77+
"51":"0",
78+
"52":"0",
79+
"53":"0",
80+
"54":"0",
81+
"55":"0",
82+
"56":"0",
83+
"57":"0",
84+
"58":"0",
85+
"59":"0",
86+
"60":"0",
87+
"61":"0",
88+
"62":"0",
89+
"63":"0"
90+
}
91+
},
92+
"SCHEDULER": {
93+
"scheduler.0" : {
94+
"type":"DWRR",
95+
"weight": "25"
96+
},
97+
"scheduler.1" : {
98+
"type":"DWRR",
99+
"weight": "30"
100+
},
101+
"scheduler.2" : {
102+
"type":"DWRR",
103+
"weight": "20"
104+
}
105+
},
106+
"PORT_QOS_MAP": {
107+
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124": {
108+
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
109+
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
110+
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
111+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
112+
"pfc_enable": "3,4"
113+
}
114+
},
115+
"WRED_PROFILE": {
116+
"AZURE_LOSSY" : {
117+
"wred_green_enable":"true",
118+
"wred_yellow_enable":"true",
119+
"wred_red_enable":"true",
120+
"ecn":"ecn_all",
121+
"red_max_threshold":"516096",
122+
"red_min_threshold":"516096",
123+
"yellow_max_threshold":"516096",
124+
"yellow_min_threshold":"516096",
125+
"green_max_threshold": "184128",
126+
"green_min_threshold": "184128"
127+
},
128+
"AZURE_LOSSLESS" : {
129+
"wred_green_enable":"true",
130+
"wred_yellow_enable":"true",
131+
"wred_red_enable":"true",
132+
"ecn":"ecn_all",
133+
"red_max_threshold":"516096",
134+
"red_min_threshold":"516096",
135+
"yellow_max_threshold":"516096",
136+
"yellow_min_threshold":"516096",
137+
"green_max_threshold": "184128",
138+
"green_min_threshold": "184128"
139+
}
140+
},
141+
"QUEUE": {
142+
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3-4" : {
143+
"scheduler" : "[SCHEDULER|scheduler.0]",
144+
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]"
145+
},
146+
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|0" : {
147+
"scheduler" : "[SCHEDULER|scheduler.1]"
148+
},
149+
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|1" : {
150+
"scheduler" : "[SCHEDULER|scheduler.2]"
151+
}
152+
}
153+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

0 commit comments

Comments
 (0)