Skip to content

Commit 0e70ba3

Browse files
zhixzhumssonicbld
zhixzhu
authored and
mssonicbld
committed
adjust port selection in case testQosSaiXonHysteresis for Cisco-8101 (sonic-net#18130)
Signed-off-by: Zhixin Zhu <[email protected]>
1 parent 8bb7203 commit 0e70ba3

1 file changed

Lines changed: 23 additions & 20 deletions

File tree

‎tests/qos/files/cisco/qos_param_generator.py‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -826,11 +826,11 @@ def mb_to_pkt_count(sq_occupancies_mb):
826826
sq_occupancies_mb = [5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4]
827827
params_1 = {"packet_size": packet_size,
828828
"ecn": 1,
829-
"dscps": [3, 4, 3, 4, 3, 4, 3, 4, 3, 3, 3],
830-
"pgs": [3, 4, 3, 4, 3, 4, 3, 4, 3, 3, 3],
831-
"queues": [3, 4, 3, 4, 3, 4, 3, 4, 3, 3, 3],
832-
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 5, 6],
833-
"dst_port_i": [7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
829+
"dscps": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3],
830+
"pgs": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3],
831+
"queues": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3],
832+
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5],
833+
"dst_port_i": [7, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13],
834834
"pkt_counts": mb_to_pkt_count(sq_occupancies_mb)}
835835
self.write_params("xon_hysteresis_1", params_1)
836836

@@ -841,8 +841,8 @@ def mb_to_pkt_count(sq_occupancies_mb):
841841
"dscps": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
842842
"pgs": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
843843
"queues": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
844-
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6],
845-
"dst_port_i": [7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
844+
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6],
845+
"dst_port_i": [7, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14],
846846
"pkt_counts": mb_to_pkt_count(sq_occupancies_mb)}
847847
self.write_params("xon_hysteresis_2", params_2)
848848

@@ -857,8 +857,8 @@ def mb_to_pkt_count(sq_occupancies_mb):
857857
self.dscp_queue1, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
858858
"pgs": [3, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
859859
"queues": [3, 1, 0, 1, 0, 1, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
860-
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9],
861-
"dst_port_i": [7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
860+
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9],
861+
"dst_port_i": [7, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15],
862862
"pkt_counts": mb_to_pkt_count(sq_occupancies_mb)}
863863
self.write_params("xon_hysteresis_3", params_3)
864864

@@ -873,8 +873,8 @@ def mb_to_pkt_count(sq_occupancies_mb):
873873
self.dscp_queue1, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
874874
"pgs": [3, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
875875
"queues": [3, 1, 0, 1, 0, 1, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
876-
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9, 10, 10, 11, 11],
877-
"dst_port_i": [7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
876+
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9, 10, 10, 11, 11],
877+
"dst_port_i": [7, 8, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16],
878878
"pkt_counts": mb_to_pkt_count(sq_occupancies_mb)}
879879
self.write_params("xon_hysteresis_4", params_4)
880880

@@ -888,9 +888,10 @@ def mb_to_pkt_count(sq_occupancies_mb):
888888
self.dscp_queue1, self.dscp_queue0,
889889
self.dscp_queue1, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
890890
"pgs": [0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
891-
"queues": [1, 0, 1, 0, 1, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
892-
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9, 10, 10, 11, 11, 12],
893-
"dst_port_i": [7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
891+
"queues": [1, 0, 1, 0, 1, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
892+
"src_port_i": [0, 0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9, 10, 10, 11, 11],
893+
"dst_port_i": [7, 8, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17,
894+
18, 18, 19, 19, 20, 20],
894895
"pkt_counts": mb_to_pkt_count(sq_occupancies_mb)}
895896
self.write_params("xon_hysteresis_5", params_5)
896897

@@ -904,8 +905,8 @@ def mb_to_pkt_count(sq_occupancies_mb):
904905
4, 3, 4, 3, 4],
905906
"pgs": [3, 4, 0, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
906907
"queues": [3, 4, 1, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
907-
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9],
908-
"dst_port_i": [7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
908+
"src_port_i": [0, 0, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6],
909+
"dst_port_i": [7, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14],
909910
"pkt_counts": mb_to_pkt_count(sq_occupancies_mb)}
910911
self.write_params("xon_hysteresis_6", params_6)
911912

@@ -917,7 +918,8 @@ def mb_to_pkt_count(sq_occupancies_mb):
917918
"pgs": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
918919
"queues": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
919920
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9, 10, 10, 11, 11, 12, 12],
920-
"dst_port_i": [7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
921+
"dst_port_i": [7, 7, 8, 8, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18,
922+
18, 19, 19, 20, 20, 21, 21],
921923
"pkt_counts": mb_to_pkt_count(sq_occupancies_mb)}
922924
self.write_params("xon_hysteresis_7", params_7)
923925

@@ -929,7 +931,8 @@ def mb_to_pkt_count(sq_occupancies_mb):
929931
"pgs": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
930932
"queues": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
931933
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9, 10, 10, 11, 11, 12, 12],
932-
"dst_port_i": [7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
934+
"dst_port_i": [7, 8, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19,
935+
19, 20, 20, 21, 21, 22, 22],
933936
"pkt_counts": mb_to_pkt_count(sq_occupancies_mb)}
934937
self.write_params("xon_hysteresis_8", params_8)
935938

@@ -944,8 +947,8 @@ def mb_to_pkt_count(sq_occupancies_mb):
944947
3, 4, 3, 4, 3, 4],
945948
"pgs": [0, 0, 0, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
946949
"queues": [1, 0, 1, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
947-
"src_port_i": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9, 10, 10, 11],
948-
"dst_port_i": [7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
950+
"src_port_i": [0, 0, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 9, 9, 10, 10],
951+
"dst_port_i": [7, 8, 11, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18],
949952
"pkt_counts": mb_to_pkt_count(sq_occupancies_mb)}
950953
self.write_params("xon_hysteresis_9", params_9)
951954

0 commit comments

Comments
 (0)