Skip to content

Commit 9f20eda

Browse files
keboliulguohan
authored andcommitted
fix a unstable swss egress acl test (#776)
1 parent 316ae6c commit 9f20eda

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

tests/test_acl_egress_table.py

+14-13
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,19 @@ def verify_acl_asic_table(self, dvs, bind_ports):
6363
assert set(port_groups) == set(acl_table_groups)
6464

6565
tbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ACL_TABLE_GROUP")
66-
(status, fvs) = tbl.get(port_groups[0])
67-
assert status == True
68-
assert len(fvs) == 3
69-
for fv in fvs:
70-
if fv[0] == "SAI_ACL_TABLE_GROUP_ATTR_ACL_STAGE":
71-
assert fv[1] == "SAI_ACL_STAGE_EGRESS"
72-
elif fv[0] == "SAI_ACL_TABLE_GROUP_ATTR_ACL_BIND_POINT_TYPE_LIST":
73-
assert fv[1] == "1:SAI_ACL_BIND_POINT_TYPE_PORT"
74-
elif fv[0] == "SAI_ACL_TABLE_GROUP_ATTR_TYPE":
75-
assert fv[1] == "SAI_ACL_TABLE_GROUP_TYPE_PARALLEL"
76-
else:
77-
assert False
66+
for port_group in port_groups:
67+
(status, fvs) = tbl.get(port_group)
68+
assert status == True
69+
assert len(fvs) == 3
70+
for fv in fvs:
71+
if fv[0] == "SAI_ACL_TABLE_GROUP_ATTR_ACL_STAGE":
72+
assert fv[1] == "SAI_ACL_STAGE_EGRESS"
73+
elif fv[0] == "SAI_ACL_TABLE_GROUP_ATTR_ACL_BIND_POINT_TYPE_LIST":
74+
assert fv[1] == "1:SAI_ACL_BIND_POINT_TYPE_PORT"
75+
elif fv[0] == "SAI_ACL_TABLE_GROUP_ATTR_TYPE":
76+
assert fv[1] == "SAI_ACL_TABLE_GROUP_TYPE_PARALLEL"
77+
else:
78+
assert False
7879

7980
tbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ACL_TABLE_GROUP_MEMBER")
8081
member = tbl.getKeys()[0]
@@ -83,7 +84,7 @@ def verify_acl_asic_table(self, dvs, bind_ports):
8384
assert len(fvs) == 3
8485
for fv in fvs:
8586
if fv[0] == "SAI_ACL_TABLE_GROUP_MEMBER_ATTR_ACL_TABLE_GROUP_ID":
86-
assert port_groups[0] == fv[1]
87+
assert fv[1] in port_groups
8788
elif fv[0] == "SAI_ACL_TABLE_GROUP_MEMBER_ATTR_ACL_TABLE_ID":
8889
table_id = fv[1]
8990
elif fv[0] == "SAI_ACL_TABLE_GROUP_MEMBER_ATTR_PRIORITY":

0 commit comments

Comments
 (0)